Ver Fonte

bug修改

1004749546@qq.com há 4 anos atrás
pai
commit
c075a535a6

+ 1 - 1
src/views/dataView/borard.vue

@@ -404,7 +404,7 @@ export default {
           const data = res.data || []
           data.forEach(item => {
 			  item.name = item.labelName
-			  item.value = Math.round(item.weight / 1000)
+			  item.value = Math.round(item.weight / 1000000)
           })
           const con6 = document.getElementById('con6')
           const chart6 = echarts.init(con6)

+ 50 - 76
src/views/equipmentManage/network/editModal.vue

@@ -175,6 +175,25 @@ export default {
       default: ''
     }
   },
+  watch: {
+	  //  父页面传过来的弹框状态
+	  openModal (newValue, oldValue) {
+	    this.isShow = newValue
+	  },
+	  //  重定义的弹框状态
+	  isShow (newValue, oldValue) {
+	    if (!newValue) {
+	      this.$emit('close')
+	    } else {
+        this.pageInit()
+	    }
+	  },
+	  networkId (newValue, oldValue) {
+	    if (this.isShow && newValue) {
+	      this.getDetails()
+	    }
+	  }
+  },
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
@@ -212,7 +231,19 @@ export default {
       return this.networkId ? '编辑' : '新增'
     }
   },
+  mounted () {
+	  this.getlableSeleteList() // 网点标签
+  },
   methods: {
+    pageInit () {
+      this.getProvinceList()
+      this.getdeliveryTimeRule() //  投递时间段
+      this.getgoldExRule() //  兑换规则
+      this.form.resetFields()
+	  if (this.lableData.length) {
+		  this.lableData.forEach(item => item.disabled = false)
+	  }
+    },
     //  获取详情
     getDetails () {
       stationFind({ id: this.networkId }).then(res => {
@@ -231,57 +262,24 @@ export default {
           this.form.setFieldsValue({ 'formData.deliveryTimeRuleNo': res.data.deliveryTimeRuleNo })
           this.form.setFieldsValue({ 'formData.labelNoList': res.data.labelNoList })
           let b = {}
-          setTimeout(() => {
-            const selectedLable = res.data.labelNoList
-            console.log(selectedLable, '-选中数据】')
-            for (var i = 0; i < selectedLable.length; i++) {
-              console.log(selectedLable.length, this.newArr, 'selectedLable.length')
-              b = this.newArr.find(k => k.labelNo == selectedLable[i])
-              console.log(selectedLable[i], 'i', b, '-xiangqngshuju')
-              if (b) {
-                this.lableData.forEach(item => {
-                  console.log(item, '----------item------------')
-                  if (item.labelType == 'org' && item.labelNo != b.labelNo) {
-                    item.disabled = true
-                  } else {
-                    item.disabled = false
-                  }
-                })
-                return
-              }
-            }
-            // for (var item of selectedLable) {
-            //   const itemLabel = item
-            //   console.log(item, '-----------------------')
-            //   b = this.newArr.find(k => k.labelNo == itemLabel)
-            //   console.log(item, 'item', b, '-xiangqngshuju')
-            //   if (b) {
-            //     this.lableData.forEach(item => {
-            //       if (item.labelType == 'org' && item.labelNo != b.labelNo) {
-            //         item.disabled = true
-            //       } else {
-            //         item.disabled = false
-            //       }
-            //     })
-            //   }
-            //   break
-            // }
-
-            // selectedLable.map(item => {
-            //   b = this.newArr.find(k => k.labelNo == item)
-            //   if (b) {
-            //     this.lableData.forEach(item => {
-            //       if (item.labelType == 'org' && item.labelNo != b.labelNo) {
-            //         item.disabled = true
-            //       } else {
-            //         item.disabled = false
-            //       }
-            //     })
-            //   }
-            // })
-            console.log(b, '-xiangqngshuju ')
-            console.log(selectedLable, '-选中数据】')
-          }, 1000)
+		  const selectedLable = res.data.labelNoList
+		  console.log(selectedLable, '-选中数据】')
+		  // 标签数据处理 当返回数据中有机构类型的标签时,其它机构类型的标签不可选
+		  for (var i = 0; i < selectedLable.length; i++) {
+		    // console.log(selectedLable.length, this.newArr, 'selectedLable.length')
+		    b = this.newArr.find(k => k.labelNo == selectedLable[i])
+		    console.log(selectedLable[i], 'i', b, '-xiangqngshuju')
+		    if (b) {
+		      this.lableData.forEach(item => {
+		        if (item.labelType == 'org' && item.labelNo != b.labelNo) {
+		          item.disabled = true
+		        } else {
+		          item.disabled = false
+		        }
+		      })
+		      return
+		    }
+		  }
         }
       })
     },
@@ -426,32 +424,8 @@ export default {
     areaCharged (val) {
       this.form.setFieldsValue({ 'formData.address': '' })
     }
-  },
-  mounted () {
-    this.getlableSeleteList() // 网点标签
-  },
-  watch: {
-    //  父页面传过来的弹框状态
-    openModal (newValue, oldValue) {
-      this.isShow = newValue
-    },
-    //  重定义的弹框状态
-    isShow (newValue, oldValue) {
-      if (!newValue) {
-        this.$emit('close')
-      } else {
-        this.getProvinceList()
-        this.getdeliveryTimeRule() //  投递时间段
-        this.getgoldExRule() //  兑换规则
-        this.form.resetFields()
-      }
-    },
-    networkId (newValue, oldValue) {
-      if (this.isShow && newValue) {
-        this.getDetails()
-      }
-    }
   }
+
 }
 </script>