fix: 修复表单验证规则和商品配置逻辑

- 在智能柜体表单中添加柜体名称长度限制
- 修改商品配置中belongType的计算逻辑
This commit is contained in:
dzq 2025-06-13 15:40:38 +08:00
parent e9bde6e00c
commit ba27975609
2 changed files with 3 additions and 3 deletions

View File

@ -426,7 +426,7 @@ onMounted(() => {
</div> </div>
</el-card> </el-card>
<GatewayConfigModal v-model="gatewayConfigVisible" :cabinet-id="cabinetId" @refresh="fetchCabinetDetail" /> <GatewayConfigModal v-model="gatewayConfigVisible" :cabinet-id="cabinetId" @refresh="fetchCabinetDetail" />
<ShopConfigModal v-model="shopConfigVisible" :cabinet-id="cabinetId" :belong-type="cabinetInfo.belongType" @refresh="fetchCabinetDetail" /> <ShopConfigModal v-model="shopConfigVisible" :cabinet-id="cabinetId" @refresh="fetchCabinetDetail" />
<MainCabinetConfigModal v-model="mainCabinetConfigVisible" :cabinet-id="cabinetId" <MainCabinetConfigModal v-model="mainCabinetConfigVisible" :cabinet-id="cabinetId"
@refresh="fetchCabinetDetail" /> @refresh="fetchCabinetDetail" />
<el-drawer v-model="editCabinetDrawerVisible" title="编辑柜体" size="30%" direction="rtl"> <el-drawer v-model="editCabinetDrawerVisible" title="编辑柜体" size="30%" direction="rtl">
@ -434,7 +434,7 @@ onMounted(() => {
@refresh="fetchCabinetDetail" /> @refresh="fetchCabinetDetail" />
</el-drawer> </el-drawer>
<el-drawer v-model="goodsConfigVisible" title="配置商品" size="50%" direction="rtl"> <el-drawer v-model="goodsConfigVisible" title="配置商品" size="50%" direction="rtl">
<CabinetGoodsConfigModal v-model="goodsConfigVisible" :cell-id="currentCellId" :belong-type="shopInfo.belongType" @refresh="fetchCellList" /> <CabinetGoodsConfigModal v-model="goodsConfigVisible" :cell-id="currentCellId" :belong-type="shopInfo.mode == 4 ? 1 : 0" @refresh="fetchCellList" />
</el-drawer> </el-drawer>
<el-drawer v-model="configuredGoodsVisible" title="管理商品" size="30%" direction="rtl"> <el-drawer v-model="configuredGoodsVisible" title="管理商品" size="30%" direction="rtl">
<ConfiguredGoodsModal v-model="configuredGoodsVisible" :cell-id="currentCell?.cellId" <ConfiguredGoodsModal v-model="configuredGoodsVisible" :cell-id="currentCell?.cellId"

View File

@ -40,7 +40,7 @@ const formData = reactive<FormDTO>({
}); });
const rules = reactive<FormRules>({ const rules = reactive<FormRules>({
cabinetName: [{ required: true, message: "柜体名称必填", trigger: "blur" }], cabinetName: [{ required: true, max:4, message: "柜体名称必填", trigger: "blur" }],
cabinetType: [{ required: true, message: "请选择柜体类型", trigger: "change" }], cabinetType: [{ required: true, message: "请选择柜体类型", trigger: "change" }],
templateNo: [{ required: true, message: "请选择模板编号", trigger: "change" }], templateNo: [{ required: true, message: "请选择模板编号", trigger: "change" }],
lockControlNo: [ lockControlNo: [