Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮

gaoluyang

2026-05-08 141a3b8aa81efa30d5efc6d6669234f4c726aa47

 src/views/basicData/product/index.vue

@@ -163,6 +163,17 @@
                        @keydown.enter.prevent />
            </el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="库存量："
                          prop="stockInventory">
              <el-input-number v-model="modelForm.stockInventory"
                               :min="0"
                               style="width: 100%"
                               placeholder="请输入库存量"
                               controls-position="right"
                               @keydown.enter.prevent />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
@@ -303,6 +314,10 @@
      prop: "unit",
    },
    {
      label: "库存量",
      prop: "stockInventory",
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
@@ -340,18 +355,18 @@
      model: "",
      unit: "",
      productCode: "",
      stockInventory: 0,
    },
    modelRules: {
      model: [{ required: true, message: "请输入", trigger: "blur" }],
      unit: [{ required: true, message: "请输入", trigger: "blur" }],
      productCode: [{ required: true, message: "请输入", trigger: "blur" }],
    },
  });
  const { form, rules, modelForm, modelRules } = toRefs(data);
  // 查询产品树
  const getProductTreeList = () => {
    treeLoad.value = true;
    productTreeList()
    productTreeList({ productType: "成品" })
      .then(res => {
        list.value = res || [];
        normalizeExpandedKeys(list.value);
@@ -407,6 +422,7 @@
    modelForm.value.model = "";
    modelForm.value.unit = "";
    modelForm.value.productCode = "";
    modelForm.value.stockInventory = 0;
    modelForm.value.id = "";
    if (type === "edit") {
      modelForm.value = { ...data };