lex 1 год назад
Родитель
Сommit
590496efbb

+ 2 - 1
src/page-instrument/view-figner/change-subject/index.tsx

@@ -39,6 +39,7 @@ export default defineComponent({
         });
       } else {
         state.subjectValue = i.id;
+        state.instrumentCode = i.value;
       }
     };
 
@@ -93,7 +94,7 @@ export default defineComponent({
             block
             onClick={() => {
               emit("close");
-              state.subjectValue = props.subject;
+              selectItem();
             }}
           >
             重置

+ 4 - 1
src/page-instrument/view-figner/index.tsx

@@ -1287,7 +1287,10 @@ export default defineComponent({
               subject={data.subject}
               onClose={() => (data.changeSubjectShow = false)}
               onConfirm={(code: any) => {
-                if (data.subject === code) return;
+                if (data.subject === code) {
+                  data.changeSubjectShow = false;
+                  return;
+                }
                 const originalSubject = JSON.parse(JSON.stringify(data.subject));
                 data.subject = code;
                 data.viewIndex = 0;