Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-manager-ui

src/views/device/drawershow.vue

@@ -266,10 +266,7 @@ export default {
   },
 
   methods: {
-    beforeSubmit(data){
-      data.defectsLiabilityPeriod = new Date(data.defectsLiabilityPeriod)
-      return data
-    },
+
     changeProduct(val) {
       this.form.productCode = this.dict.productCode[val];
     },
@@ -294,7 +291,7 @@ export default {
       this.reset();
       this.urls.currUrl = "/device/add";
       this.pageInfo.type = "add";
-      this.form.siteId = row.siteId;
+      this.siteId = row.siteId;
       this.siteName = row.siteName;
       this.siteCode = row.siteCode;
       this.getData();
@@ -319,6 +316,9 @@ export default {
       if (this.pageInfo.type == "add" || this.pageInfo.type == "edit") {
         this.form.siteName = this.siteName;
         this.form.siteCode = this.siteCode;
+        this.form.siteId = this.siteId;
+
+        console.log("this.form.siteId",this.form.siteId)
       }
     },
 

src/views/device/list.vue

@@ -470,7 +470,8 @@ export default {
     this.info = this.$route.query;
     this.query = { siteId: this.siteId };
     this.upload.headers.Authorization=window.sessionStorage.getItem("token") || ""
-    console.log(this.upload);
+    console.log("upload",this.upload);
+    console.log("query",this.$route.query);
     this.$get("/sitestat/siteInfo", {
       siteId: this.siteId,
     })
@@ -555,7 +556,7 @@ export default {
       row.siteId = this.siteId;
       row.siteName = this.siteName;
       row.siteCode = this.siteCode;
-
+      console.log((this.siteId))
       this.$refs.drawerform.add(row);
     },
     /** 重写编辑方法 */