Merge remote-tracking branch 'origin/master' into master

@@ -715,10 +715,10 @@ export default {
 		countList: {
 		countList: {
 			handler : function (newVal, oldVal) {
 			handler : function (newVal, oldVal) {
 				newVal.forEach((i,ind)=>{
 				newVal.forEach((i,ind)=>{
+					if(i.qlxzdm != '' &&i.qlxzdm != null){
+						this.$refs.qlxzdm[ind].$el.style.border=""
+					}
 					i.list.forEach((item,index)=>{
 					i.list.forEach((item,index)=>{
-						if(item.qlxzdm != '' &&item.qlxzdm != null){
-							this.$refs.qlxzdm[ind].$el.style.border=""
-						}
 						if(item.sjytdm != '' &&item.sjytdm != null){
 						if(item.sjytdm != '' &&item.sjytdm != null){
 							this.$refs.sjytdm[ind].$el.style.border=""
 							this.$refs.sjytdm[ind].$el.style.border=""
 						}
 						}