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

qq_41295110

2025-11-19 5fa77e254003aea6060e3f70d64e5fd1bcdb4748

 src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue

@@ -35,15 +35,15 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="采购员" prop="HEmpName">
                <el-input v-model="form.HEmpName" placeholder="请选择采购员" disabled>
              <el-form-item label="业务员" prop="HEmpName">
                <el-input v-model="form.HEmpName" placeholder="请选择业务员" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="部门" prop="HDeptName">
                <el-input v-model="form.HCusName" placeholder="请选择采购部门" disabled>
                <el-input v-model="form.HDeptName" placeholder="请选择部门" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                </el-input>
              </el-form-item>
@@ -52,7 +52,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="供应商" prop="HSupName">
                <el-input v-model="form.HWHName" placeholder="请选择供应商" disabled>
                <el-input v-model="form.HSupName" placeholder="请选择供应商" disabled>
                  <el-button
                    slot="append"
                    icon="el-icon-search"
@@ -69,15 +69,13 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="汇率" prop="HRemarHExRatek">
              <el-form-item label="汇率" prop="HExRate">
                <el-input-number v-model="form.HExRate" placeholder="请输入汇率" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="发票编号" prop="HWHName">
                <el-input v-model="form.HWHName" placeholder="请选择仓库">
                  <el-button slot="append" icon="el-icon-search"></el-button>
                </el-input>
              <el-form-item label="发票编号" prop="HInvoiceBillNo">
                <el-input v-model="form.HInvoiceBillNo" placeholder=""> </el-input>
              </el-form-item>
            </el-col>
          </el-row>
@@ -105,7 +103,12 @@
            <el-col :span="6">
              <el-form-item label="组织" prop="HOrgID">
                <el-select v-model="form.HOrgID">
                  <el-option></el-option>
                  <el-option
                    v-for="(item, index) in organizationList"
                    :key="index"
                    :label="item.Name"
                    :value="item.ID"
                  ></el-option>
                </el-select>
              </el-form-item> </el-col
          ></el-row>
@@ -281,6 +284,11 @@
            <span>{{ scope.row.计量单位 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="收料仓库" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.收料仓库 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="数量" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HQty }}</span>
@@ -289,6 +297,16 @@
        <el-table-column align="center" label="单价" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="含税单价" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxPrice }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="金额" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HMoney }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="备注" width="120">
@@ -381,7 +399,7 @@
      deptform: {}, //弹窗选中数据
      openData: false, //数据弹窗
      dialogTitle: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), // 组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改3）
      HInterID: null,
@@ -436,7 +454,7 @@
    };
  },
  created() {
    this.fetchData();
    // this.fetchData();
    this.getdata();
  },
  beforeDestroy() {
@@ -753,8 +771,11 @@
    //退出
    close() {
      this.reset();

      if (!this.OperationType2 && !this.copyType) {
      if (window.self != window.top) {
        // iframe页面
        console.log(window.parent);
        window.parent.editGyClose();
      } else if (!this.OperationType2 && !this.copyType) {
        // this.$router.back()
        window.close();
      } else {
@@ -854,7 +875,7 @@
      this.reset();
      let rowHmainid = this.HInterID2;
      axios
        .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
        .get(this.baseURL + "/Cg_POInStockBill/cx", {
          params: { HInterID: rowHmainid },
        })
        .then((response) => {
@@ -862,49 +883,60 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号,
              HInterID: data.hmainid,
              HDate: dayjs(data.日期).format("YYYY-MM-DD"),
              HSeOrderBillNo_M: data.销售订单号,
              HEmpID: data.HEmpID,
              HEmpName: data.业务员,
              HCusID: data.HCusID,
              HCusName: data.客户,
              HWHID: data.主仓库ID,
              HWHName: data.主发货仓库,
              HAddress: data.交货地址,
              HDeptName: data.部门,
              HDeptID: data.HDeptID,
              HCurID: data.HCurID,
              HCurName: data.币别,
              HSSID: data.HSSID,
              HSSName: data.结算方式,
              HExRate: data.汇率,
              HManagerName: data.主管,
              HManagerID: data.HManagerID,
              HSourceBillType: data.源单类型,
              HLinkMan: data.联系人,
              HLinkPhone: data.联系电话,
              //, "HConveyCompID": data.运输公司
              //, "HConveyTypeID": data.运输方式
              //, "HConveyMoney": data.运费
              //, "HDFflag": data.是否垫付
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目编码,
              HProjectName: data.项目名称,

              Box2: "",
              HRemark: data.表头备注,
              HMaker: data.制单人,
              HChecker: data.审核人,
              HCloseMan: data.关闭人,
              HMakeDate: data.制单日期,
              HCheckDate: data.审核日期,
              HCloseDate: data.关闭日期,
              HUpDateDate: data.修改日期,
              HDeleteDate: data.作废日期,
            });
            this.form = {
              ...{
                HBillNo: data.单据号,
                HDate: dayjs(data.日期),
                HInnerBillNo: data.内部单据号,
                HEmpID: data.HEmpID,
                HEmpName: data.业务员,
                HSupID: data.HSupID,
                HSupName: data.供应商,
                HWHID: data.主表仓库ID,
                HWHName: data.主表仓库,
                HCurID: data.HCurID,
                HCurName: data.币别,
                HExRate: data.汇率,
                HDeptName: data.部门,
                HDeptID: data.HDeptID,
                HManagerName: data.主管,
                HManagerID: data.HManagerID,
                HSourceBillType: data.源单类型,
                HAddress: data.交货地点,
                HExRate: data.汇率,
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目代码,
                HProjectName: data.项目名称,
                HInvoiceBillNo: data.发票编号,
                Box2: "",
                HRemark: data.表头备注,
                HMaker: data.制单人,
                HChecker: data.审核人,
                HCloseMan: data.关闭人,
                HUpDater: data.修改人,
                HDeleteMan: data.作废人,
                HMakeDate:
                  data.制单日期 == null
                    ? ""
                    : dayjs(data.制单日期).format("YYYY-MM-DD hh:mm:ss"),
                HCheckDate:
                  data.审核日期 == null
                    ? ""
                    : dayjs(data.审核日期).format("YYYY-MM-DD hh:mm:ss"),
                HCloseDate:
                  data.关闭日期 == null
                    ? ""
                    : dayjs(data.关闭日期).format("YYYY-MM-DD hh:mm:ss"),
                HUpDateDate:
                  data.修改日期 == null
                    ? ""
                    : dayjs(data.修改日期).format("YYYY-MM-DD hh:mm:ss"),
                HDeleteDate:
                  data.作废日期 == null
                    ? ""
                    : dayjs(data.作废日期).format("YYYY-MM-DD hh:mm:ss"),
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();
@@ -924,7 +956,7 @@
              this.form.HCloseDate = data.关闭日期;
              this.form.HDeleteDate = data.作废日期;
            }
            this.getCustomerByCusID(response.data.data[0].HCusID); //根据客户获取联系人，联系人电话
            // this.getCustomerByCusID(response.data.data[0].HCusID); //根据客户获取联系人，联系人电话
            let subdata = result.data;
            for (var i = 0; i < subdata.length; i++) {
              this.editData.push({
@@ -935,11 +967,19 @@
                HUnitID: subdata[i].HUnitID,
                计量单位: subdata[i].计量单位,
                HWHID: subdata[i].HWHID,
                发货仓库: subdata[i].发货仓库,
                收料仓库: subdata[i].收料仓库,
                HSPID: subdata[i].HSPID,
                仓位名称: subdata[i].仓位名称,
                HSecUnitID: subdata[i].HSecUnitID,
                辅助单位: subdata[i].辅助单位,
                HQty: subdata[i].数量,
                HPrice: subdata[i].单价,
                HMoney: subdata[i].金额,
                HRemark: subdata[i].表体备注,
                HPrice: subdata[i].单价,
                HTaxPrice: subdata[i].含税单价,
                HMoney: subdata[i].金额,
                HDiscountRate: subdata[i].折扣率,
                HTaxRate: subdata[i].税率,
                HTaxMoney: subdata[i].税额,
                HSourceBillNo: subdata[i].源单单号, //源单号
                HSourceBillType: subdata[i].源单类型, //源单类型
                HSourceInterID: subdata[i].源单主内码, //源单主内码
@@ -957,23 +997,6 @@
        .catch((error) => {
          this.$modal.msgError("接口请求失败! ");
          console.error(error);
        });
    },
    //根据客户带出联系人、联系电话
    getCustomerByCusID(HCusID) {
      axios
        .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
          params: {
            HCusID: HCusID,
          },
        })
        .then((response) => {
          this.form.联系人 = response.data.data[0].HLinkMan;
          this.form.联系电话 = response.data.data[0].HLinkPhone;
          // this.form = response.data.data[0]
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    /** 销售出库子表明细序号 */