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

陈婷婷

2025-11-20 63ce1ab231a876242969f702305fc802105ca06e

 src/views/basic/gyWarehouse/gyWarehouseEdit.vue

@@ -47,10 +47,19 @@
              <el-form-item label="仓库类型" prop="HWarehouseType">
                <el-select v-model="form.HWarehouseType" placeholder="请选择仓库类型">
                  <el-option
                    v-for="(item, index) in HWarehouseTypeList"
                    :key="index"
                    :label="item.Name"
                    :value="item.Name"
                    v-for="item in [
                      {
                        label: '生产仓库',
                        value: '生产仓库',
                      },
                      {
                        label: '模具仓库',
                        value: '模具仓库',
                      },
                    ]"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                  >
                  </el-option>
                </el-select>
@@ -265,26 +274,12 @@
      ids: [],

      // 表单参数
      form: {
        HWarehouseType: "生产仓库",
      },
      form: {},
      // 表单校验
      rules: {
        HNumber: [{ required: true, message: "仓库代码不能为空", trigger: "blur" }],
        HName: [{ required: true, message: "仓库名称名称不能为空", trigger: "blur" }],
        HWarehouseType: [
          { required: true, message: "仓库类型不能为空", trigger: "blur" },
        ],
      },

      HWarehouseTypeList: [
        {
          Name: "生产仓库",
        },
        {
          Name: "模具仓库",
        },
      ],
    };
  },
  created() {
@@ -324,7 +319,6 @@
    },
    getdata() {
      this.reset();
      console.log(this.OperationType);
      if (this.OperationType != 1) {
        this.zzSelDis = true;
        axios
@@ -339,52 +333,68 @@
            if (result.code == 1) {
              // 说明验证成功了，
              var data = result.data[0];

              Object.assign(this.form, {
                HNumber: data.仓库代码,
                HItemID: data.HItemID,
                HParentID: data.HParentID,
                HShortNumber: data.HNumber,
                HName: data.仓库名称,
                HHelpCode: data.HHelpCode,
                HEmpID: data.HEmpID,
                HEmpName: data.HEmpName,
                HAddress: data.仓库地址,
                HPhone: data.联系电话,
                HStopflag: data.禁用标记,
                HStockCtrlFlag: data.负库存控制标记,
                HSPFlag: data.启用仓位 == "Y" ? 1 : 0,
                HRemark: data.HRemark,
                HWarehouseType: data.仓库类型,
                //, "HItemID": data.条码编号
                HBarCode: data.HBarCode,
                HUSEORGID: data.HUSEORGID,
                //, "HCreator": data.创建人
                //, "lngBillKey": data.lngBillKey
                //, "lngBillSubKey": data.lngBillSubKey
                //, "HMaker": data.HMaker
                //, "HCreateDate": data.创建日期
                HUpDater: sessionStorage["HUserName"],
                HMakeEmp: data["创建人"],
                HMakeDate:
                  data["创建日期"] == null
                    ? ""
                    : dayjs(new Date(data["创建日期"])).format("yyyy-MM-dd"),
                HCheckEmp: data["审核人"],
                HCheckDate:
                  data["审核日期"] == null
                    ? ""
                    : dayjs(new Date(data["审核日期"])).format("yyyy-MM-dd"),
                HStopEmp: data["禁用人"],
                HStopDate:
                  data["禁用日期"] == null
                    ? ""
                    : dayjs(new Date(data["禁用日期"])).format("yyyy-MM-dd"),
              });
              // 使用 Object.assign 丢失响应式 改为使用 this.form = {...{}}
              this.form = {
                ...{
                  HNumber: data.仓库代码,
                  HItemID: data.HItemID,
                  HParentID: data.HParentID,
                  HShortNumber: data.HNumber,
                  HName: data.仓库名称,
                  HHelpCode: data.HHelpCode,
                  HEmpID: data.HEmpID,
                  HEmpName: data.HEmpName,
                  HAddress: data.仓库地址,
                  HPhone: data.联系电话,
                  HStopflag: data.禁用标记 == "true",
                  HStockCtrlFlag: data.负库存控制标记 == "true",
                  HSPFlag: data.启用仓位 == "Y" ? true : false,
                  HRemark: data.HRemark,
                  HWarehouseType: data.仓库类型,
                  //, "HItemID": data.条码编号
                  HBarCode: data.HBarCode,
                  HUSEORGID: data.HUSEORGID,
                  //, "HCreator": data.创建人
                  //, "lngBillKey": data.lngBillKey
                  //, "lngBillSubKey": data.lngBillSubKey
                  //, "HMaker": data.HMaker
                  //, "HCreateDate": data.创建日期
                  HUpDater: sessionStorage["HUserName"],
                  HMakeEmp: data["创建人"],
                  HMakeDate:
                    data["创建日期"] == null
                      ? ""
                      : dayjs(new Date(data["创建日期"])).format("yyyy-MM-dd"),
                  HCheckEmp: data["审核人"],
                  HCheckDate:
                    data["审核日期"] == null
                      ? ""
                      : dayjs(new Date(data["审核日期"])).format("yyyy-MM-dd"),
                  HStopEmp: data["禁用人"],
                  HStopDate:
                    data["禁用日期"] == null
                      ? ""
                      : dayjs(new Date(data["禁用日期"])).format("yyyy-MM-dd"),
                },
              };
              if (!data.HCheckEmp) {
                this.CheckBillDisabled = false;
              }
            }

            if (this.OperationType == 2) {
              // 复制
              Object.assign(this.form, {
                HItemID: 0,
                HMakeEmp: sessionStorage["HUserName"],
                HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
                HCheckEmp: "",
                HCheckDate: "",
                HStopEmp: "",
                HStopDate: "",
              });
            }

            this.$nextTick(() => {
              this.formShow = true;
              this.formLoading = false;