spring
昨天 a1274d448fa9fd59da39d94f5d91e54780fc8de1
fix: 出入库只有吨和公斤才能转换单位,其他单位不用转换。
已修改5个文件
104 ■■■■ 文件已修改
src/views/basicData/product/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/dispatchLog/Record.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/Record.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/New.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/Subtract.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/index.vue
@@ -158,9 +158,9 @@
                placeholder="请选择单位"
                clearable
                style="width: 100%"
                :filterable="isConsumablesBranch"
                :allow-create="isConsumablesBranch"
                :default-first-option="isConsumablesBranch"
                filterable
                allow-create
                default-first-option
              >
                <el-option
                  v-for="u in unitSelectOptions"
@@ -282,7 +282,7 @@
  if (isConsumablesBranch.value) {
    return ["吨", "公斤", "件", "个数",'桶'];
  }
  return ["吨", "公斤"];
  return ["吨", "公斤",'块','方','箱','袋','瓶','桶','盒','包','件','个数'];
});
// 查询产品树
src/views/inventoryManagement/dispatchLog/Record.vue
@@ -200,9 +200,14 @@
                placeholder="请选择单位"
                style="width: 100%"
                clearable
                :disabled="!canEditUnit"
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
                <el-option
                  v-for="item in editableUnitOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item
@@ -409,6 +414,21 @@
const isShowEditModal = ref(false);
const editFormRef = ref(null);
const editForm = ref({});
const unitEditableValues = ['吨', '公斤'];
const canEditUnit = computed(() => unitEditableValues.includes(editForm.value?.unit));
const editableUnitOptions = computed(() => {
  const options = [
    { label: '吨', value: '吨' },
    { label: '公斤', value: '公斤' },
  ];
  const currentUnit = editForm.value?.unit;
  if (currentUnit && !unitEditableValues.includes(currentUnit)) {
    return [{ label: currentUnit, value: currentUnit }];
  }
  return options;
});
// 毛重 - 皮重 计算净重(保留两位小数,且不为负)
const computeNetWeightEdit = () => {
src/views/inventoryManagement/receiptManagement/Record.vue
@@ -187,9 +187,14 @@
                placeholder="请选择单位"
                style="width: 100%"
                clearable
                :disabled="!canEditUnit"
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
                <el-option
                  v-for="item in editableUnitOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item
@@ -395,6 +400,21 @@
const isShowEditModal = ref(false);
const editFormRef = ref(null);
const editForm = ref({});
const unitEditableValues = ['吨', '公斤'];
const canEditUnit = computed(() => unitEditableValues.includes(editForm.value?.unit));
const editableUnitOptions = computed(() => {
  const options = [
    { label: '吨', value: '吨' },
    { label: '公斤', value: '公斤' },
  ];
  const currentUnit = editForm.value?.unit;
  if (currentUnit && !unitEditableValues.includes(currentUnit)) {
    return [{ label: currentUnit, value: currentUnit }];
  }
  return options;
});
// 毛重 - 皮重 计算净重(保留两位小数,且不为负)
const computeNetWeightEdit = () => {
src/views/inventoryManagement/stockManagement/New.vue
@@ -70,9 +70,14 @@
              placeholder="请选择单位"
              style="width: 100%"
              clearable
              :disabled="!canEditUnit"
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
            <el-option
                v-for="item in editableUnitOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item
@@ -220,6 +225,21 @@
});
const showProductSelectDialog = ref(false);
const unitEditableValues = ['吨', '公斤'];
const canEditUnit = computed(() => unitEditableValues.includes(formState.value?.unit));
const editableUnitOptions = computed(() => {
  const options = [
    {label: '吨', value: '吨'},
    {label: '公斤', value: '公斤'},
  ];
  const currentUnit = formState.value?.unit;
  if (currentUnit && !unitEditableValues.includes(currentUnit)) {
    return [{label: currentUnit, value: currentUnit}];
  }
  return options;
});
let { proxy } = getCurrentInstance()
src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -68,9 +68,14 @@
                placeholder="请选择单位"
                style="width: 100%"
                clearable
                :disabled="!canEditUnit"
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
              <el-option
                  v-for="item in editableUnitOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item
@@ -235,6 +240,21 @@
});
const showProductSelectDialog = ref(false);
const unitEditableValues = ['吨', '公斤'];
const canEditUnit = computed(() => unitEditableValues.includes(formState.value?.unit));
const editableUnitOptions = computed(() => {
  const options = [
    {label: '吨', value: '吨'},
    {label: '公斤', value: '公斤'},
  ];
  const currentUnit = formState.value?.unit;
  if (currentUnit && !unitEditableValues.includes(currentUnit)) {
    return [{label: currentUnit, value: currentUnit}];
  }
  return options;
});
let { proxy } = getCurrentInstance()