Merge remote-tracking branch 'origin/dev_天津_阳光印刷' into dev_天津_阳光印刷

liyong

2026-04-11 71780527b9bf5fc832e27bf6429602e462103833

 src/views/inventoryManagement/stockManagement/New.vue

@@ -7,6 +7,8 @@
        @close="closeModal"
    >
      <el-form label-width="140px" :model="formState" :rules="rules" label-position="top" ref="formRef">
        <el-row :gutter="16">
          <el-col :xs="24" :sm="12">
        <el-form-item
            label="产品名称"
            prop="productModelId"
@@ -22,27 +24,36 @@
            {{ formState.productName ? formState.productName : '选择产品' }}
          </el-button>
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="规格"
            prop="productModelName"
        >
          <el-input v-model="formState.productModelName"  disabled />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="单位(主)"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="单位(辅)"
            prop="subUnit"
        >
          <el-input v-model="formState.subUnit"  disabled />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="仓库编码"
            prop="warehouseCode"
@@ -51,39 +62,59 @@
            <el-option v-for="item in warehouseCode" :key="item.value" :label="item.value" :value="item.value" />
          </el-select>
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="仓库名称"
            prop="warehouseName"
        >
          <el-input v-model="formState.warehouseName"  disabled />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="存货编码"
            prop="productCode"
        >
          <el-input v-model="formState.productCode"  />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            label="库存数量"
                label="库存(主)数量"
            prop="qualitity"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
        </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
        <el-form-item
            v-if="type === 'qualified'"
                label="库存(辅)数量"
                prop="subQualitity"
            >
              <el-input-number v-model="formState.subQualitity" :step="1" :min="1" style="width: 100%" />
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12" v-if="type === 'qualified'">
            <el-form-item
            label="库存预警数量"
            prop="warnNum"
        >
          <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
        </el-form-item>
          </el-col>

          <el-col :span="24">
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
        </el-form-item>
          </el-col>
        </el-row>
      </el-form>

      <!-- 产品选择弹窗 -->
@@ -143,6 +174,7 @@
  warehouseName: "",
  qualitity: 0,
  warnNum: 0,
  subQualitity: 0,
  remark: '',
});

@@ -181,6 +213,7 @@
    warehouseCode: "",
    warehouseName: "",
    warnNum: 0,
    subQualitity: 0,
    remark: '',
  };
  isShow.value = false;