Merge branch 'stag' into dev

src/views/customer/file/detail.vue

@@ -132,8 +132,8 @@ const formOptionTwo = reactive({
       },
       {
         type: "input",
-        label: proxy.t("customerFile.customerName"),
-        prop: "customerName",
+        label: proxy.t("customerFile.customerName1"),
+        prop: "followUpUserName",
       },
       {
         type: "input",

src/views/customer/file/index.vue

@@ -46,7 +46,7 @@ const getList = (type) => {
         res.data.rows = res.data.rows.map((item) => {
           return {
             ...item,
-            cityText: item.countryName + "," + item.provinceName + "," + item.cityName,
+            cityText: item.countryName || null + "," + item.provinceName || null  + "," + item.cityName || null ,
           };
         });
       }