diff --git a/src/views/cabinet/shop/shop-form-modal.vue b/src/views/cabinet/shop/shop-form-modal.vue
index c2c2fd0..b215823 100644
--- a/src/views/cabinet/shop/shop-form-modal.vue
+++ b/src/views/cabinet/shop/shop-form-modal.vue
@@ -23,11 +23,13 @@ const formRef = ref();
const formData = ref({
corpid: wxStore.corpid,
shopId: 0,
- shopName: ""
+ shopName: "",
+ belongType: undefined
});
const rules = {
- shopName: [{ required: true, message: "请输入地址名称", trigger: "blur" }]
+ shopName: [{ required: true, message: "请输入地址名称", trigger: "blur" }],
+ belongType: [{ required: true, message: "请选择商品模式", trigger: "change" }]
};
watch(
@@ -85,6 +87,12 @@ const handleClose = () => {
+
+
+
+
+
+
取消
diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue
index 4f956e6..d296dd2 100644
--- a/src/views/cabinet/smart-cabinet-card/detail.vue
+++ b/src/views/cabinet/smart-cabinet-card/detail.vue
@@ -304,9 +304,9 @@ onMounted(() => {
{{ getBalanceEnableText(cabinetInfo.balanceEnable)
}}
-
+
+ {{ cabinetInfo.belongType === 0 ? '借还模式' : '固资模式' }}
+
@@ -351,7 +351,7 @@ onMounted(() => {
-
+
{{ item.cellNo }}
diff --git a/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue b/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
index 9afd92e..d9e3c40 100644
--- a/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
+++ b/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
@@ -104,21 +104,21 @@ watch(() => props.cabinetInfo, (newVal) => {
-
+
-
+
diff --git a/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue b/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
index c9c871d..5d1db79 100644
--- a/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
+++ b/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
@@ -103,21 +103,21 @@ const templateOptions = Object.entries(CabinetImgMap).map(([value, item]) => ({
-
+
-
+
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1cb1f7e..37d0a33 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -216,7 +216,17 @@ onSearch().then(() => {
statusList[item].label }}
-->
-
+
+
+
+