Merge branch 'blueBranch' into allTestUrgent

src/template/selectSaler/index.vue

@@ -34,19 +34,19 @@
               prop="areaname"
               :label="$t(`负责区域`)"
               width="0">
-            <template slot-scope="scope">
-              <span v-if="scope.row.salearea">
-                <span v-for="(item,index) in scope.row.salearea" :key="index">
-                  {{index === scope.row.salearea.length -1?item.areafullname:item.areafullname + '，'}}
-                </span>
-              </span>
-              <span v-else>
-                {{'--'}}
-              </span>
-            </template>
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="scope.row.salearea">-->
+<!--                <span v-for="(item,index) in scope.row.salearea" :key="index">-->
+<!--                  {{index === scope.row.salearea.length -1?item.areafullname:item.areafullname + '，'}}-->
+<!--                </span>-->
+<!--              </span>-->
+<!--              <span v-else>-->
+<!--                {{'&#45;&#45;'}}-->
+<!--              </span>-->
+<!--            </template>-->
           </el-table-column>
           <el-table-column
-            prop="phonenumber"
+            prop="userphonenumber"
             :label="$t(`手机号码`)"
             width="150">
           </el-table-column>