Merge remote-tracking branch 'origin/main'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.0-rc.6",
+  "version": "2.0.0-rc.7",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/locales/zh/products.json

@@ -1,5 +1,6 @@
 {
   "ProductType": "项目类型",
+  "ContractRemarks": "合同备注",
   "type": {
     "Experience": "综费",
     "Car": "车费",

src/stores/Products/Index.js

@@ -137,6 +137,32 @@ export const deleteQuotationAction = async (id) => {
   return { errcode, result, success: errcode === 0 };
 }
 
+/**
+ * 获取合同备注
+ */
+export const fetchRemarkList = async (params) => {
+  const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_memo_get`, params)
+  return { errcode, result, success: errcode === 0 }
+}
+
+/**
+ * 获取合同备注
+ */
+export const postRemarkList = async (params) => {
+  const { errcode, result } = await postJSON(`${HT_HOST}/Service_BaseInfoWeb/agency_product_memo_add`, params)
+  return { errcode, result, success: errcode === 0 }
+}
+
+const defaultRemarkList =  [
+  {id: 0, "product_type_id": "6","Memo": ""},
+  {id: 0, "product_type_id": "B","Memo": ""},
+  {id: 0, "product_type_id": "J","Memo": ""},
+  {id: 0, "product_type_id": "Q","Memo": ""},
+  {id: 0, "product_type_id": "7","Memo": ""},
+  {id: 0, "product_type_id": "R","Memo": ""},
+  {id: 0, "product_type_id": "D","Memo": ""}
+]
+
 const initialState = {
   loading: false,
   searchValues: {},  // 客服首页: 搜索条件
@@ -148,7 +174,8 @@ const initialState = {
   quotationList: [], // 编辑页: 当前产品报价列表
   editing: false,
   switchParams: {}, // 头部切换参数
-};
+}
+
 export const useProductsStore = create(
   devtools((set, get) => ({
     // 初始化状态
@@ -193,6 +220,45 @@ export const useProductsStore = create(
 
     reset: () => set(initialState),
 
+    getRemarkList: async() => {
+      const {switchParams} = get()
+      const { result, success } = await fetchRemarkList({
+        travel_agency_id: switchParams.travel_agency_id, use_year: switchParams.use_year
+      })
+      if (success) {
+        const mapRemarkList = defaultRemarkList.map(remark => {
+          const filterResult = result.filter(r => r.product_type_id === remark.product_type_id)
+          if (filterResult.length > 0) return filterResult[0]
+          else return remark
+        })
+
+        return Promise.resolve(mapRemarkList)
+      } else {
+        return Promise.resolve('获取合同备注失败')
+      }
+    },
+
+    saveOrUpdateRemark: async(remarkList) => {
+      const {switchParams} = get()
+
+      const mapRemarkList = remarkList.map(remark => {
+        return {
+          id: remark.id,
+          travel_agency_id: switchParams.travel_agency_id,
+          use_year: switchParams.use_year,
+          product_type_id: remark.product_type_id,
+          Memo: remark.Memo,
+        }
+      })
+
+      const { result, success } = await postRemarkList(mapRemarkList)
+      if (success) {
+        return Promise.resolve(result)
+      } else {
+        return Promise.resolve('保存合同备注失败')
+      }
+    },
+
     newEmptyQuotation: () => ({
       id: null,
       adult_cost: 0,

src/views/account/Management.jsx

@@ -128,6 +128,11 @@ function Management() {
   const onAccountFinish = (values) => {
     saveOrUpdateAccount(values)
       .then(() => {
+        notification.info({
+          message: 'Notification',
+          description: '账号保存成功',
+          placement: 'top',
+        })
         setAccountModalOpen(false)
         handelAccountSearch()
       })

src/views/products/Detail/ContractRemarksModal.jsx

@@ -0,0 +1,93 @@
+import { useState } from 'react'
+import { Form, Modal, Input, Button, Flex, App } from 'antd'
+import { useTranslation } from 'react-i18next'
+import useProductsStore from '@/stores/Products/Index'
+import { useProductsTypesMapVal } from '@/hooks/useProductsSets'
+import RequireAuth from '@/components/RequireAuth'
+import { PERM_PRODUCTS_OFFER_PUT } from '@/config'
+
+export const ContractRemarksModal = () => {
+  const { t } = useTranslation()
+
+  const { notification } = App.useApp()
+  const productsTypesMapVal = useProductsTypesMapVal()
+  const [getRemarkList, saveOrUpdateRemark] = useProductsStore((state) => [
+    state.getRemarkList, state.saveOrUpdateRemark
+  ])
+
+  const [isRemarksModalOpen, setRemarksModalOpen] = useState(false)
+  const [remarksForm] = Form.useForm()
+
+  const onRemarksFinish = () => {
+    const remarkList = remarksForm.getFieldsValue().remarkList
+    saveOrUpdateRemark(remarkList)
+      .then(() => {
+        notification.info({
+          message: 'Notification',
+          description: '合同备注保存成功',
+          placement: 'top',
+        })
+      })
+      .catch(ex => {
+        notification.error({
+          message: 'Notification',
+          description: ex.message,
+          placement: 'top',
+        })
+      })
+  }
+
+  const handleContractRemarks = () => {
+    getRemarkList()
+      .then(list => {
+        remarksForm.setFieldsValue({remarkList:list})
+      })
+
+    setRemarksModalOpen(true)
+  }
+
+  const getFieldLabel = (field) => {
+    const remarkList = remarksForm.getFieldsValue([['remarkList']]).remarkList
+    return productsTypesMapVal[remarkList[field.key].product_type_id]?.label
+  }
+
+  return (
+    <>
+      <RequireAuth subject={PERM_PRODUCTS_OFFER_PUT}>
+        <Button size='small' onClick={handleContractRemarks}>{t('products:ContractRemarks')}</Button>
+      </RequireAuth>
+
+      <Modal
+        centered
+        title={t('products:ContractRemarks')}
+        width={'640px'}
+        open={isRemarksModalOpen}
+        onOk={() => onRemarksFinish()}
+        onCancel={() => setRemarksModalOpen(false)}
+        destroyOnClose
+        forceRender
+      >
+        <Form
+          labelCol={{ span: 3 }}
+          wrapperCol={{ span: 20 }}
+          form={remarksForm}
+          name='remarksForm'
+          autoComplete='off'
+        >
+          <Form.List name='remarkList'>
+            {(fields) => (
+              <Flex gap='middle' vertical>
+                {fields.map((field) => (
+                  <Form.Item label={getFieldLabel(field)} name={[field.name, 'Memo']} key={field.key}>
+                    <Input.TextArea rows={2}></Input.TextArea>
+                  </Form.Item>
+                ))}
+              </Flex>
+            )}
+          </Form.List>
+        </Form>
+      </Modal>
+    </>
+  );
+};
+export default ContractRemarksModal

src/views/products/Detail/Header.jsx

@@ -14,6 +14,7 @@ import dayjs from 'dayjs';
 import VendorSelector from '@/components/VendorSelector';
 import AuditStateSelector from '@/components/AuditStateSelector';
 import NewProductModal from './NewProductModal';
+import ContractRemarksModal from './ContractRemarksModal'
 
 import AgencyContract from '../Print/AgencyContract_v0903';
 import { saveAs } from "file-saver";
@@ -190,6 +191,7 @@ const Header = ({ refresh, ...props }) => {
           {t('products:auditStateAction.Rejected')}
         </Button>
       </RequireAuth>
+      <ContractRemarksModal />
       {/* todo: export, 审核完成之后才能导出 */}
       <RequireAuth subject={PERM_PRODUCTS_OFFER_AUDIT}>
         <Button size='small' onClick={handleDownload}>{t('Export')} .docx</Button>

src/views/products/Detail/ProductInfoQuotation.jsx

@@ -139,7 +139,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
 
   const [isQuotationModalOpen, setQuotationModalOpen] = useState(false)
   const [isBatchSetupModalOpen, setBatchSetupModalOpen] = useState(false)
-  const { modal, notification } = App.useApp();
+  const { modal, notification } = App.useApp()
   const [quotationForm] = Form.useForm()
   const [batchSetupForm] = Form.useForm()