Ver código fonte

演练bug修改

jingyuanchao 2 anos atrás
pai
commit
4e8f74465e

+ 5 - 4
src/views/core/drill/task/dialog.newtask.vue

@@ -104,7 +104,7 @@
     <dialog-drill-dictionary-select
       ref="DialogDrillDictionarySelect"
       :defaultSelect=defaultSelect
-      @select="materialsSelect"
+      @select="drillDictionarySelect"
       :orgId="this.$store.getters.orgId">
     </dialog-drill-dictionary-select>
   </div>
@@ -354,10 +354,11 @@ export default {
       }
     },
     selectMaterials() {
-      this.$refs["DialogDrillDictionarySelect"].show();
+      console.log("selectMaterials",this.formData)
+      this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
-    materialsSelect(){
-
+    drillDictionarySelect(data){
+      this.formData.presetCase=data[0].defaultCause;
     },
 
   },

+ 5 - 4
src/views/core/drill/task/dialog.perform.vue

@@ -104,7 +104,7 @@
     <dialog-drill-dictionary-select
       ref="DialogDrillDictionarySelect"
       :defaultSelect=defaultSelect
-      @select="materialsSelect"
+      @select="drillDictionarySelect"
       :orgId="this.$store.getters.orgId"
     ></dialog-drill-dictionary-select>
   </div>
@@ -381,10 +381,11 @@ export default {
       }
     },
     selectMaterials() {
-      this.$refs["DialogDrillDictionarySelect"].show();
+      console.log("selectMaterials",this.formData)
+      this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
-    materialsSelect(){
-
+    drillDictionarySelect(data){
+    this.formData.presetCase=data[0].defaultCause;
     },
 
 

+ 12 - 5
src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -94,11 +94,16 @@ export default {
     orgId: {},
   },
   methods: {
-    show() {
+    show(type) {
+      console.log("show", type)
       this.search = this.emptySearch();
-      console.log("this.search", this.search)
       this.isShow = true;
       this.selectList = this.defaultSelect;
+      console.log("this.selectList", this.selectList)
+      /*if (type){
+        this.search.drillType = parseInt(type);
+        this.onSelect( this.search)
+      }*/
     },
     onHide() {
       this.isShow = false;
@@ -114,12 +119,14 @@ export default {
     },
     emptySearch() {
       return {
-        title: null,
-        fileName: null,
+        id: null,
+        drillType: null,
         orgId: this.$store.getters.orgId,
-        // t:new Date(),
       };
     },
+    getOne(type){
+
+    },
 
   },
   mounted() {