Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-07 27da7b76d81f97e84ebdded5f62023151989ab11

 src/views/clientManagement/clientManagement.vue

@@ -730,17 +730,13 @@
              this.form.street = address.substring(address.indexOf("区")+1,address.length);
            }
            //写入新的省市区
            that.form.province = "11";
            that.form.city = "1101";
            that.form.district = "110101";
            // that.form.province = val.addressComponent.province;
            // if(val.addressComponent.city==""){
            //     that.form.city = val.addressComponent.province;
            // }else{
            //     that.form.city = val.addressComponent.city;
            // }
            // that.form.district = val.addressComponent.district;
            //调用接口获取省市区编号
            that.form.province = val.addressComponent.province;
            if(val.addressComponent.city==""){
                that.form.city = val.addressComponent.province;
            }else{
                that.form.city = val.addressComponent.city;
            }
            that.form.district = val.addressComponent.district;
          }
        },
        immediate: true,
@@ -865,6 +861,10 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        debugger;
        if(Array.isArray(row.deptId)){
            row.deptId = row.deptId.join(",");
        }
        update(row).then(() => {
          // this.initFlag = false;
          this.onLoad(this.page);
@@ -1001,7 +1001,19 @@
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;
            } else {
              data.records[i].dxzt = data.records[i].dtype;
              if(data.records[i].dtype==1){
                  data.records[i].dxzt = data.records[i].dtype;
              }
              if(data.records[i].dtype==2){
                  data.records[i].dxzt = 2;
              }
              if(data.records[i].dtype==3){
                  data.records[i].dxzt = 3;
              }
              if(data.records[i].dtype=="" || data.records[i].dtype==0){
                  data.records[i].dxzt = 1;
              }
             
            }
          }