添加 辅助属性 修改 条码生成页面 选源单 模块获取单据 逻辑 调整 调拨申请单 添加 物料 可选辅助属性

chenhaozhe

2025-12-10 fed5c0ec889ad66057c353f93550e6434353a38f

添加 辅助属性 修改 条码生成页面 选源单 模块获取单据 逻辑 调整 调拨申请单 添加 物料 可选辅助属性

 src/router/index.js

@@ -584,7 +584,7 @@
    ],
  },
  //#endregion
  

  //#region 生产入库单
  {
    path: "/icmo",
@@ -739,7 +739,7 @@
    ],
  },
  //#endregion
  

  //#region 销售退货单列表
  {
    path: "/sell/StockBillMainList/KfICStockBillMainList",
@@ -813,7 +813,7 @@
    ],
  },
  //#endregion 
  

  //#region 器具主档
  {
    path: "/scMould/basicModeling/Gy_MouldFile",
@@ -863,7 +863,7 @@
  },
  //#endregion
  //#endregion 
  

  //#region 器具仓存管理
  //#region 器具领用申请单列表
  {
@@ -1296,7 +1296,7 @@
    ],
  },
  //#endregion
  

  //#region 仓位
  {
    path: "/basic/gy/gyStockPlace",
@@ -1396,7 +1396,7 @@
  },
  //#endregion
  //#endregion
  

  //#region 物流基础资料
  //#region 驾驶员列表
  {
@@ -1468,7 +1468,7 @@
  //#endregion

  //#endregion
  

  //#region 费用基础资料
  //#region 费用项目列表
  {//src\views\basic\gyItemMoney\gyItemMoney.vue
@@ -1491,6 +1491,27 @@
  },
  //#endregion
  //#endregion
  
  //#region 辅助属性基础资料
   {//src\views\basic\gyItemMoney\gyItemMoney.vue
    path: "/basic",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/gyProperty",
        component: () => import("@/views/basic/gyProperty/gyPropertyList.vue"),
        name: "GyProperty",
        meta: { title: "辅助属性列表", activeMenu: "basic/gy" },
      },
    ],
  },
  //#endregion
  //#endregion

  //#region 通用页面
@@ -1512,7 +1533,7 @@
  //#endregion
  //#endregion
  //#endregion
  

  //#region 节点页面
  {
    path: "/iframe",
@@ -1593,8 +1614,14 @@
        name: "IframeGyCarEdit",
        meta: { title: "车辆编辑", noCache: true, noLoading: true },
      },
      {
        path: "GyProperty",
        component: () => import("@/views/basic/gyProperty/gyPropertyList"), // 辅助属性
        name: "IframeGyProperty",
        meta: { title: "辅助属性", noCache: true, noLoading: true },
      },
    ],
  }, 
  },
  //#endregion
];


 src/store/modules/permission.js

@@ -610,6 +610,18 @@
                    name: "GyCustomer",
                    path: "GyCustomer",
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "辅助属性列表",
                    },
                    component: () => import("@/views/basic/gyProperty/gyPropertyList.vue"),
                    hidden: false,
                    name: "GyProperty",
                    path: "gyProperty",
                  },
                ],
              },
            ],

 src/views/basic/gyProperty/gyPropertyList.vue

@@ -8,18 +8,18 @@
      class="searchBox"
    >
      <el-row>
        <el-form-item label="仓库代码" prop="HNumber" style="padding-left: 100px">
        <el-form-item label="辅助属性代码" prop="HNumber" style="padding-left: 100px">
          <el-input
            v-model="queryParams.HNumber"
            placeholder="请输入仓库代码"
            placeholder="请输入辅助属性代码"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
        </el-form-item>
        <el-form-item label="仓库名称" prop="HName">
        <el-form-item label="辅助属性名称" prop="HName">
          <el-input
            v-model="queryParams.HName"
            placeholder="请输入仓库名称"
            placeholder="请输入辅助属性名称"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
@@ -38,15 +38,6 @@
            >
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="同步" :inline="true">
          <el-input
            v-model="queryParams.HSyncNumber"
            placeholder="请输入仓库代码"
            @keyup.enter.native="handleSync"
          >
            <el-button slot="append" type="primary" @click="handleSync">同步</el-button>
          </el-input>
        </el-form-item>
      </el-row>
      <el-form-item label-width="78px">
@@ -201,7 +192,7 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-download"
@@ -209,9 +200,9 @@
          @click="handleImport"
          >导入</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
      </el-col> -->
       <!-- <el-col :span="1.5">
       <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
@@ -219,8 +210,8 @@
          id="btn-Add"
          >新增</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-edit"
@@ -229,8 +220,8 @@
          @click="handleEdit((row = rowForm), (OperationType = 3))"
          >编辑</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-edit"
@@ -239,7 +230,7 @@
          @click="handleEdit((row = rowForm), (OperationType = 2))"
          >复制</el-button
        >
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -780,11 +771,10 @@
      this.sWhere += "";
      //生产资料列表
      axios
        .get(this.baseURL + "/Gy_WareHouse/listpage", {
        .get(this.baseURL + "/Gy_Property/listPage", {
          params: {
            sWhere: `${this.sWhere}`,
            user: sessionStorage["HUserName"],
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
          },
@@ -1041,7 +1031,7 @@
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
        this.$emit("deptEmit", row, 2);
        this.$emit("deptEmit", row, 'gyProperty');
      }
    },
    //选中行高亮样式
@@ -1065,7 +1055,7 @@
      }
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit("deptEmitDb", row, 2);
        this.$emit("deptEmitDb", row, 'gyProperty');
      } else {
        this.handleEdit(row);
      }
@@ -1175,9 +1165,7 @@
        this.sWhere += " and 仓库名称 like '%" + this.queryParams.HName + "%'";
      }
      if (this.queryParams.HOrgID) {
        let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
          ?.Name;
        this.sWhere += " and 组织名称 = '" + OrgName + "'";
        this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
      }
      // this.sWhere += this.addSWhereByOpenType()
      // this.sWhere += this.getOrgIDByUser()

 src/views/component/HSourceReportHtml/index.vue

@@ -297,7 +297,7 @@
                }
            }
            // 列表
            axios.get(this.baseURL + "/Sc_BarCode/ReportFromBillList", {
            axios.get(this.baseURL + "/Sc_BarCode/ReportFromBillList_New", {
                params: {
                    sWhere: this.sWhere,
                    HSouceBillType: this.HSouceBillType,

 src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue

@@ -137,8 +137,8 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="调入组织" prop="HSTOCKINORGID">
                <el-select v-model="form.HSTOCKINORGID" placeholder="请选择调入组织">
              <el-form-item label="调入组织" prop="HSTOCKINORGID" >
                <el-select v-model="form.HSTOCKINORGID" placeholder="请选择调入组织" :disabled="OperationType == 3">
                  <el-option
                    v-for="(item, index) in organizationList"
                    :key="index"
@@ -151,7 +151,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="调出组织" prop="HSTOCKOUTORGID">
                <el-select v-model="form.HSTOCKOUTORGID" placeholder="请选择调入组织">
                <el-select v-model="form.HSTOCKOUTORGID" placeholder="请选择调入组织" :disabled="OperationType == 3">
                  <el-option
                    v-for="(item, index) in organizationList"
                    :key="index"
@@ -300,7 +300,7 @@
              >下移</el-button
            >
          </div>
          <!-- TODO 明细列表添加辅助属性选择 -->
          <!-- TODO: 明细列表添加辅助属性选择 -->
          <el-table
            :data="editData"
            style="width: 100%"
@@ -337,6 +337,16 @@
            <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">
                <el-input
                  v-model="scope.row.辅助属性"
                  placeholder="请输入"
                  @keyup.native.f7="openDataDialog(7, scope.row)"
                  @dblclick.native="openDataDialog(7, scope.row)"
                />
              </template>
            </el-table-column>
            <el-table-column align="center" label="换算率" width="120">
@@ -476,6 +486,12 @@
        :openPage="HModName"
        v-if="materialShow"
      />
      <GyProperty
        @deptEmitDb="dbEmitData"
        @deptEmit="emitData"
        :openPage="HModName"
        v-if="propertyShow"
      />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -505,11 +521,20 @@
import Warehouse from "@/views/basic/gyWarehouse/gyWarehouse.vue";
import GySupplier from "@/views/basic/gy/gySupplier.vue";
import Material from "@/views/gyMaterial/GyMaterial.vue";
import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
import moment from "moment";

export default {
  name: "Kf_MoveStockRequestBillEdit",
  components: { Dept, Warehouse, RowSettings, GyEmployee, GySupplier, Material },
  components: {
    Dept,
    Warehouse,
    RowSettings,
    GyEmployee,
    GySupplier,
    Material,
    GyProperty,
  },
  props: {
    OperationType: { type: Number },
    linterid: { type: Number },
@@ -534,6 +559,7 @@
      gyEmployeeShow: false, //销售员数据组件
      gySupplierShow: false, //供应商数据组件
      materialShow: false, //物料数据组件
      propertyShow: false, // 辅助属性基础资料
      eHWHType: 1, //仓库弹窗区分标志
      empType: 1, //职员弹窗区分标志
      deptform: {}, //弹窗选中数据
@@ -659,7 +685,7 @@
    //弹窗赋值
    dbEmitData(deptRow, num) {
      // num=1部门 num=2仓库
      console.log(deptRow);
      console.log(deptRow, num);
      if (deptRow.HItemID || deptRow.hmainid) {
        if (num == 1) {
          this.form.HDeptName = deptRow.部门名称;
@@ -711,6 +737,12 @@
          this.form.HSupName = deptRow.供应商名称;
          this.form.HSupID = deptRow.HItemID;
          this.gySupplierShow = false;
          this.openData = false;
        } else if (num == "gyProperty") {
          this.editData[this.zbIndex].HPropertyID = deptRow.HItemID;
          this.editData[this.zbIndex]["辅助属性"] = deptRow["辅助属性名称"];

          this.propertyShow = false;
          this.openData = false;
        }
      } else {
@@ -836,10 +868,9 @@
      //新增获取单据号
      this.getHBillNo();
      let date = new Date();
      this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
      this.form.HSTOCKOUTORGID = sessionStorage["OrganizationID"];
      this.form.HSTOCKINORGID = sessionStorage["OrganizationID"];
      this.form.HSTOCKORGID = sessionStorage["OrganizationID"];
      this.$set(this.form, "HSTOCKOUTORGID", sessionStorage["OrganizationID"]);
      this.$set(this.form, "HSTOCKINORGID", sessionStorage["OrganizationID"]);
      this.$set(this.form, "HDate", moment(date).format("YYYY-MM-DD HH:mm:ss"));
      if (this.OperationType == 1) {
        this.handleAddSysZb();
      }
@@ -880,13 +911,10 @@
            var result = response.data;
            var data = response.data.data;
            console.log(result, data);
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();
              this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
            } else {
              this.allVal = data[0];
              this.form = {

            this.allVal = data[0];
            this.form = {
              ...{
                HBillNo: data[0].单据号,
                HDate: data[0].日期,
                HDeptName: data[0].部门,
@@ -917,42 +945,52 @@
                HCloseDate: data[0].关闭日期,
                HUpDateDate: data[0].修改日期,
                HDeleteDate: data[0].作废日期,
                HSTOCKOUTORGID: sessionStorage["OrganizationID"],
                HSTOCKORGID: sessionStorage["OrganizationID"],
              };
              //子表
              var rowdata = [];
              for (let i = 0; i < data.length; i++) {
                rowdata.push({
                  HMaterID: data[i].HMaterID,
                  物料代码: data[i].物料代码,
                  物料名称: data[i].物料名称,
                  规格型号: data[i].规格型号,
                  HUnitID: data[i].HUnitID,
                  计量单位: data[i].计量单位,
                  HSecUnitRate: data[i].换算率,
                  HSecUnitID: data[i].HSecUnitID,
                  辅助计量单位: data[i].辅助计量单位,
                  HQtyMust: data[i].应收数量,
                  HQty: data[i].实收数量,
                  HRemark: data[i].表体备注,
                  HPrice: data[i].单价,
                  HMoney: data[i].金额,
                  HOutPrice: data[i].调出单价,
                  HOutMoney: data[i].调出金额,
                  HWHID: data[i].HWHID,
                  调入仓库: data[i].调入仓库,
                  HSCWHID: data[i].HSCWHID,
                  调出仓库: data[i].调出仓库,
                  HBASEUNITID: data[i].HBASEUNITID,
                  基本计量单位: data[i].基本计量单位,
                  HEXTAUXUNITID: data[i].HEXTAUXUNITID,
                  辅单位: data[i].辅单位,
                  HSTOCKORGID: sessionStorage["OrganizationID"],
                });
              }
              this.editData = rowdata;
                HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
                HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
              },
            };
            //子表
            var rowdata = [];
            for (let i = 0; i < data.length; i++) {
              rowdata.push({
                HMaterID: data[i].HMaterID,
                物料代码: data[i].物料代码,
                物料名称: data[i].物料名称,
                规格型号: data[i].规格型号,
                HUnitID: data[i].HUnitID,
                计量单位: data[i].计量单位,
                HSecUnitRate: data[i].换算率,
                HSecUnitID: data[i].HSecUnitID,
                辅助计量单位: data[i].辅助计量单位,
                HQtyMust: data[i].应收数量,
                HQty: data[i].实收数量,
                HRemark: data[i].表体备注,
                HPrice: data[i].单价,
                HMoney: data[i].金额,
                HOutPrice: data[i].调出单价,
                HOutMoney: data[i].调出金额,
                HWHID: data[i].HWHID,
                调入仓库: data[i].调入仓库,
                HSCWHID: data[i].HSCWHID,
                调出仓库: data[i].调出仓库,
                HBASEUNITID: data[i].HBASEUNITID,
                基本计量单位: data[i].基本计量单位,
                HEXTAUXUNITID: data[i].HEXTAUXUNITID,
                辅单位: data[i].辅单位,
                HSTOCKORGID: data[i]["HSTOCKORGID"],
                HPropertyID: data[i]["HPropertyID"],
                辅助属性: data[i]["辅助属性"],
              });
            }
            this.editData = rowdata;

            // 渲染完后再参与是否复制的判断
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();
              this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
            }

            this.formShow = true;
            this.formLoading = false;
          }
@@ -997,6 +1035,8 @@
          辅单位: "",
          HRemark: "",
          HSTOCKORGID: sessionStorage["OrganizationID"],
          HPropertyID: 0,
          辅助属性: "",
        };
        if (index) {
          this.editData.splice(index, 0, obj);
@@ -1176,6 +1216,10 @@
        this.dialogTitle = "供应商列表";
        this.gySupplierShow = true;
        this.openData = true;
      } else if (num == 7) {
        this.dialogTitle = "辅助属性列表";
        this.propertyShow = true;
        this.openData = true;
      }
    },
  },

 src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue

@@ -172,7 +172,7 @@
              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
              <div :style="item.style">
                <span v-if="column.property.includes('日期')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
                <el-button type="text" @click.stop="handleEdit(row, OperationType = 3)"
                  v-else-if="column.property == '单据号'">{{
                    row.单据号
                  }}</el-button>