同城分销店拆分、分销店对应多个经销商

src/views/signApproval/newStoreApprovalDetail.vue

@@ -494,15 +494,18 @@ export default {
           } else {
             this.GZAttributeFormShow = false;
           }
-          if (this.list.storeCategory == '129081') {
-            this.dictTypeFormShow = true;
-            if (this.list.attribute3 != '0' && this.list.attribute3 != null) {
-              this.list.tcfxName = this.list.attribute3;
-            } else {
-              this.list.tcfxName = this.list.attribute5;
-            }
-          }
-          if (this.list.storeCategory == '10131') {
+          // if (this.list.storeCategory == '129081') {
+          //   this.dictTypeFormShow = true;
+          //   if (this.list.attribute3 != '0' && this.list.attribute3 != null) {
+          //     this.list.tcfxName = this.list.attribute3;
+          //   } else {
+          //     this.list.tcfxName = this.list.attribute5;
+          //   }
+          // }
+          if (
+            this.verifyStoreType(this.list.storeCategory) &&
+            this.verifyStoreType(this.list.storeCategory).type == 'fxd'
+          ) {
             this.dictTypeFormShow = true;
             for (var k = 0; k < this.TCFXList.length; k++) {
               if (this.TCFXList[k].dictCode == this.list.tcfxName) {

src/views/storeManagement/storeEdit.vue

@@ -1354,19 +1354,23 @@ export default {
           }
           // this.getChainsByDeptCode(res.data.orgId)
           this.getChainsByDeptCode(null, res.data.ifJzStoreType);
-          if (this.fromValue.storeCategory == '129081' || this.fromValue.storeCategory == '10131') {
+          if (
+            this.verifyStoreType(this.fromValue.storeCategory) &&
+            this.verifyStoreType(this.fromValue.storeCategory).tcfx
+          ) {
             this.typeABshow = true;
+            this.dictTypeFormShow = true;
           }
-          if (this.fromValue.storeCategory == '129081') {
-            this.dictTypeAFormShow = true;
-          }
+          // if (this.fromValue.storeCategory == '129081') {
+          //   this.dictTypeAFormShow = true;
+          // }
+          // if (this.fromValue.storeCategory == '10131') {
+          //   this.dictTypeFormShow = true;
+          // }
 
           if (this.fromValue.attribute3 == '0') {
             this.attrShow = true;
           }
-          if (this.fromValue.storeCategory == '10131') {
-            this.dictTypeFormShow = true;
-          }
           if (this.fromValue.storeCategory == 'sjs61') {
             this.dictTypeSJSFormShow = true;
           }
@@ -1524,11 +1528,16 @@ export default {
         }
       }
     },
+    // 同城分销-属性信息
     getTCFXList() {
       getTCFXList({}).then((res) => {
         var TCFXList = [];
         for (var t = 0; t < res.data.length; t++) {
-          TCFXList.push({ text: res.data[t].dictLabel, dictCode: res.data[t].dictValue });
+          TCFXList.push({
+            text: res.data[t].dictLabel,
+            dictCode: res.data[t].dictValue,
+            remark: res.data[t].remark,
+          });
         }
         this.TCFXList = TCFXList;
       });
@@ -1614,21 +1623,28 @@ export default {
       // || value.dictValue == "129081" ||value.dictValue == "10131"
       this.fromValue.storeCategoryName = value.text;
       this.fromValue.storeCategory = value.dictValue;
-      if (value.dictValue == '129081' || value.dictValue == '10131') {
+      if (
+        this.verifyStoreType(this.fromValue.storeCategory) &&
+        this.verifyStoreType(this.fromValue.storeCategory).tcfx
+      ) {
         this.typeABshow = true;
+        this.dictTypeFormShow = true;
       } else {
         this.typeABshow = false;
         this.fromValue.carShop = '';
         this.fromValue.carShopImgList = [];
-      }
-
-      if (value.dictValue == '129081') {
-        this.dictTypeAFormShow = true;
-      } else {
         this.fromValue.tcfxName = '';
         this.fromValue.tcfxCode = '';
-        this.dictTypeAFormShow = false;
+        this.dictTypeFormShow = false;
       }
+
+      // if (value.dictValue == '129081') {
+      //   this.dictTypeAFormShow = true;
+      // } else {
+      //   this.fromValue.tcfxName = '';
+      //   this.fromValue.tcfxCode = '';
+      //   this.dictTypeAFormShow = false;
+      // }
       if (value.dictValue == 'C917') {
         this.GZAttributeFormShow = true;
         this.dictTypeSJSFormShow = false;
@@ -1641,13 +1657,13 @@ export default {
         this.fromValue.tcfxCode = '';
         this.GZAttributeFormShow = false;
       }
-      if (value.dictValue == '10131') {
-        this.dictTypeFormShow = true;
-      } else {
-        this.fromValue.tcfxName = '';
-        this.fromValue.tcfxCode = '';
-        this.dictTypeFormShow = false;
-      }
+      // if (value.dictValue == '10131') {
+      //   this.dictTypeFormShow = true;
+      // } else {
+      //   this.fromValue.tcfxName = '';
+      //   this.fromValue.tcfxCode = '';
+      //   this.dictTypeFormShow = false;
+      // }
       if (value.dictValue == 'sjs61') {
         this.dictTypeSJSFormShow = true;
       } else {
@@ -1812,9 +1828,7 @@ export default {
         this.$toast('图片未上传');
         return;
       } else if (
-        (fromValue.storeCategory == '10131' ||
-          fromValue.storeCategory == 'sjs61' ||
-          fromValue.storeCategory == 'zyjz63') &&
+        (fromValue.storeCategory == 'sjs61' || fromValue.storeCategory == 'zyjz63') &&
         fromValue.tcfxName == ''
       ) {
         this.$toast('属性未填写');
@@ -1824,12 +1838,16 @@ export default {
         this.$toast('家装展厅面积未填写');
         return;
       }
-      if (fromValue.storeCategory == '129081' && fromValue.attribute3 == '') {
+      if (
+        this.verifyStoreType(this.fromValue.storeCategory) &&
+        this.verifyStoreType(this.fromValue.storeCategory).tcfx
+      ) {
         this.$toast('属性未填写');
         return;
       }
       if (
-        fromValue.storeCategory == '129081' &&
+        this.verifyStoreType(this.fromValue.storeCategory) &&
+        this.verifyStoreType(this.fromValue.storeCategory).tcfx &&
         fromValue.attribute3 == '0' &&
         fromValue.attribute5 == ''
       ) {