udpate 混料批次编辑

src/components/DialogJustForm.vue

@@ -121,6 +121,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    // extraParams: {
+    //   type: Object,
+    //   default: () => ({})
+    // }
   },
   inject: ["urls"],
   data() {
@@ -248,7 +252,7 @@ export default {
     },
 
     /** init **/
-    init(id, detailMode, extraParams) {
+    init(id, detailMode, tagInfo, extraParams) {
       // console.log("[DialogJustForm] init", this.dataForm, id, detailMode);
       if (this.$refs.dataForm) {
         // console.log("[DialogJustForm] clearing form validation...");
@@ -258,6 +262,14 @@ export default {
 
       this.detailMode = detailMode ?? false;
 
+      /** 判断 extraParams */
+      if (extraParams && typeof extraParams === "object") {
+        for (const [key, value] of Object.entries(extraParams)) {
+          // console.log("[dialog] dataForm | key | value", this.dataForm, key, value);
+          this.$set(this.dataForm, key, value);
+        }
+      }
+
       this.$nextTick(() => {
         this.dataForm.id = id || null;
         if (this.dataForm.id) {
@@ -298,15 +310,6 @@ export default {
               });
             });
         } else {
-          // 如果不是编辑，看看是否有其他 extraParams
-
-          if (extraParams && typeof extraParams === "object") {
-            for (const [key, value] of Object.entries(extraParams)) {
-              this.$set(this.dataForm, key, value);
-              console.log('[DialogJustForm] setting: ', key, value)
-            }
-          }
-
           this.loadingStatus = false;
         }
       });

src/components/noTemplateComponents/operationComponent.js

@@ -59,23 +59,23 @@ export default {
       let emitFull = false;
       let eventType = "default";
       let customField;
+      let payload = {};
       if (typeof opt === "object") {
         eventType = opt.name;
         customField = opt.emitField || "id";
         emitFull = opt.emitFull || false;
+        if ("url" in opt) {
+          payload.url = this.injectData.url;
+        }
+        if ("toRouter" in opt) {
+          payload.toRouter = opt.toRouter;
+        }
       } else {
         eventType = opt;
       }
 
       /** 处理 toRouter */
-      let payload = { type: eventType, data: emitFull ? this.injectData : customField ? this.injectData[customField] : this.injectData.id };
-      if ("url" in opt) {
-        payload.url = this.injectData.url;
-      }
-      if ("toRouter" in opt) {
-        payload.toRouter = opt.toRouter;
-      }
-      // this.$emit('emit-data', { type: eventType, data: emitFull ? this.injectData : customField ? this.injectData[customField] : this.injectData.id, url: this.injectData.url, toRouter: opt.toRouter })
+      payload = { ...payload, type: eventType, data: emitFull ? this.injectData : customField ? this.injectData[customField] : this.injectData.id };
       this.$emit("emit-data", payload);
     },
   },