Merge branch 'main' into refactor/WO_n_PD/all

beyond-sw-camp · Jan 3, 2025 · b412126 · b412126
2 parents 8bed150 + 7ecc5d5
commit b412126
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SCM/frontend/src/components/common/Chatbot.vue b/SCM/frontend/src/components/common/Chatbot.vue
@@ -42,7 +42,7 @@ const fetchChatbot = async () => {
 // 질문인지 답변인지 체크
 const canQuestion = computed(() => {
   // items 배열의 마지막 role이 'model'인지 확인
-  return items.value.length > 0 && items.value[items.value.length - 1].role === 'model';
+  return items.value.length === 0 || (items.value.length > 0 && items.value[items.value.length - 1].role === 'model');
 });
 
 // 질문은 답변이후에만 다시 할 수 있음

diff --git a/SCM/frontend/src/components/shippingInstruction/ShippingInstructionList.vue b/SCM/frontend/src/components/shippingInstruction/ShippingInstructionList.vue
@@ -100,7 +100,7 @@ const itemDelete = async (seq) => {
 }
 
 const shippingSlipRegister = async (seq) => {
-  const result = await sConfirm("출하전표를 등록하시겠습니까?");
+  const result = confirm("출하전표를 등록하시겠습니까?");
   if (result) {
     emit('shippingSlipRegisterEvent', seq);
   }

diff --git a/SCM/frontend/src/views/salesOrder/SalesOrderSituationView.vue b/SCM/frontend/src/views/salesOrder/SalesOrderSituationView.vue
@@ -4,7 +4,7 @@ import SalesOrderSituation from '@/components/salesOrder/SalesOrderSituation.vue
 </script>
 
 <template>
-    <h4 class="title">영업관리 > 주문서 현황황</h4>
+    <h4 class="title">영업관리 > 주문서 현황</h4>
     <SalesOrderSituation />
 </template>