Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/finance/contrast/index.vue

@@ -1594,10 +1594,14 @@ export default {
     addOrUpdateHandle() {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
-      let id = "448";
-      let actId = "110";
+      let id = null;
+      if (this.queryParams.fId) {
+        id = this.queryParams.fId
+      } else {
+        id = this.queryParams.id
+      }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId);
+        this.$refs.addOrUpdate.init(id, this.contrastId);
       });
     },
     // 撤销对账