Merge branch 'dev' into pre-production

src/views/basicdata/brand/basicClient.vue

@@ -1487,28 +1487,53 @@ export default {
             i.typeServiceNameFy = typeServiceName.join(',');
           }
         });
+        // 缺少判断
+        // let dz = '';
+        // data.records.forEach(it => {
+        //   let arrsheng = this.optioner.filter(i => {
+        //     return it.bladeRegionProvinceId == i.value;
+        //   });
+        //   if (arrsheng.length == 0) return;
+        //   // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+        //   let arrshi = arrsheng[0].children.filter(i => {
+        //     return it.bladeRegionCityId == i.value;
+        //   });
+        //   // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+        //   let arrqu = arrshi[0].children.filter(i => {
+        //     return it.bladeRegionAreaId == i.value;
+        //   });
+
+        //   // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+        //   dz =
+        //     arrsheng[0].label +
+        //     (arrshi[0].label ? `/${arrshi[0].label}` : ``) +
+        //     (arrqu[0]?.label ? `/${arrqu[0]?.label}` : '');
+        //   it.bladeRegionProvinceId = dz;
+        // });
+        // 修改后
         let dz = '';
         data.records.forEach(it => {
           let arrsheng = this.optioner.filter(i => {
             return it.bladeRegionProvinceId == i.value;
           });
           if (arrsheng.length == 0) return;
-          // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+
           let arrshi = arrsheng[0].children.filter(i => {
             return it.bladeRegionCityId == i.value;
           });
-          // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+          if (arrshi.length == 0) return;
+
           let arrqu = arrshi[0].children.filter(i => {
             return it.bladeRegionAreaId == i.value;
           });
-          // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+          if (arrqu.length == 0) return;
+
           dz =
             arrsheng[0].label +
             (arrshi[0].label ? `/${arrshi[0].label}` : ``) +
             (arrqu[0]?.label ? `/${arrqu[0]?.label}` : '');
           it.bladeRegionProvinceId = dz;
         });
-
         // console.log("dzdz",dz);
         this.page.total = data.total;
         this.data = data.records;