Merge branch 'feature/bugfix-微信总量页面页面报错' of http://git.gicdev.com/gicmember/member

src/components/posmembers/posmembers.js

@@ -983,7 +983,8 @@ export default {
             let tempArr = res.data.result;
             showFields = tempArr;
             tempArr.forEach(item => {
-              if (item.check) {
+              if(item.code==='name') this.checkedFields.push(item.code);
+              else if (item.check) {
                 this.checkedFields.push(item.code);
               }
               this.memberFields.push(item.code);

src/components/posmembers/posmembers.vue

@@ -495,6 +495,7 @@
                 <el-checkbox
                   :label="item"
                   :key="item"
+                  :disabled="item==='name'"
                 >{{item | formatFieldName }}</el-checkbox>
               </div>
             </div>

src/components/wechatmembers/total.js

@@ -989,7 +989,8 @@ export default {
             let tempArr = res.data.result;
             showFields = tempArr;
             tempArr.forEach(item => {
-              if (item.check) {
+              if(item.code==='name') this.checkedFields.push(item.code);
+              else if (item.check) {
                 this.checkedFields.push(item.code);
               }
               this.memberFields.push(item.code);

src/components/wechatmembers/wechat-total.vue

@@ -490,6 +490,7 @@
                 <el-checkbox
                   :label="item"
                   :key="item"
+                  :disabled="item==='name'"
                 >{{item | formatFieldName }}</el-checkbox>
               </div>
             </div>

src/components/wechatmembers/wechatmembers.js

@@ -896,7 +896,8 @@ export default {
             let tempArr = res.data.result;
             showFields = tempArr;
             tempArr.forEach(item => {
-              if (item.check) {
+              if(item.code==='name') this.checkedFields.push(item.code);
+              else if (item.check) {
                 this.checkedFields.push(item.code);
               }
               this.memberFields.push(item.code);

src/components/wechatmembers/wechatmembers.vue

@@ -488,6 +488,7 @@
                 <el-checkbox
                   :label="item"
                   :key="item"
+                  :disabled="item==='name'"
                 >{{item | formatFieldName }}</el-checkbox>
               </div>
             </div>