update code

src/app/apis/url.js

@@ -104,6 +104,9 @@ export default {
     listRequest: `${root}/customerCare/list`,
     updateStatusRequest: `${root}/customerCare/changeStatus`,
     detailCustomerCare: `${root}/customerCare`,
+
+
+    
     //dropdown
     dropdownFuntions: `${root}/dropdown/function`,
     dropdownPermission: `${root}/function/getFunctionTree`,

src/app/components/dialog/CreateFountain.jsx

@@ -99,19 +99,24 @@ export default function FormDialog({ onCreate }) {
     }
 
     const handleSubmit = async (value) => {
+
+        if(state?.product_id && state?.name?.trim()  &&  state?.code?.trim()){
             let index=listProduct.findIndex(e=>e.id==state.product_id)
             if(index!=-1){
-            console.log(listProduct[index])
-            console.log("listProduct",listProduct)
-        
-            console.log('state', state)
-
            onCreate({...state,type,type_name:listProduct[index].type_name, product_name: listProduct[index].product_name})
            setOpen(false)
            setState({})
            setType()
         } 
 
+        }else{
+
+            toast.warning('Bạn chưa nhập đầy đủ thông tin', {
+                theme: 'colored',
+            })
+        }
+       
+
       
 
     }

src/app/views/Company/Employee/View.js

@@ -77,7 +77,7 @@ function CustomerView(props) {
                             <TextField
                                 variant="outlined"
                                 className="w-full"
-                                label="Tên thành viên"
+                                label="Nhập từ khoá"
                                 onChange={(e) => {
                                     const text = e.target.value
                                     setTimeout(() => {

src/app/views/GasStation/Create.js

@@ -105,7 +105,7 @@ const SimpleForm = (props) => {
     }
 
     const onCreateField = (value) => {
-        if (value) {
+        if (value && value.trim()) {
             console.log('value', value)
             if (
                 listField.findIndex(
@@ -722,7 +722,9 @@ const SimpleForm = (props) => {
                                     }}
                                     color="inherit"
                                     variant="contained"
-                                    onClick={() => {}}
+                                    onClick={() => {
+                                        history.goBack()
+                                    }}
                                 >
                                     <span className="capitalize">Quay lại</span>
                                 </Button>

src/app/views/GasStation/Update.js

@@ -798,7 +798,9 @@ const SimpleForm = (props) => {
                                     }}
                                     color="inherit"
                                     variant="contained"
-                                    onClick={() => {}}
+                                    onClick={() => {
+                                        history.goBack()
+                                    }}
                                 >
                                     <span className="capitalize">Quay lại</span>
                                 </Button>

src/app/views/Merchant/Update.js

@@ -643,7 +643,9 @@ const SimpleForm = (props) => {
                                     }}
                                     color="inherit"
                                     variant="contained"
-                                    onClick={() => {}}
+                                    onClick={() => {
+                                        history.goBack()
+                                    }}
                                 >
                                     <span className="capitalize">Quay lại</span>
                                 </Button>

src/app/views/Merchant/View.js

@@ -77,7 +77,7 @@ function CustomerView(props) {
                             <TextField
                                 variant="outlined"
                                 className="w-full"
-                                label="Tên pháp nhân"
+                                label="Nhập từ khoá"
                                 onChange={(e) => {
                                     const text = e.target.value
                                     setTimeout(() => {