Merge branch 'cgh-ghx-app' into 'v2-test'

app.json

 {
-  "name": "highchem",
-  "displayName": "highchem"
+  "name": "gaohuaxue",
+  "displayName": "gaohuaxue"
 }

src/locales/en_US/order.ts

@@ -440,4 +440,6 @@ export default {
   'order.requireOrder.requestNo': 'Purchase request number:',
   'order.requireOrder.feedbackInformation': 'feedback information',
   'order.requireOrder.baojiadanshenhebutongguo': 'The quotation was not approved',
+
+  'shop.other.hint': 'prompt'
 };

src/locales/ja_JPN/order.ts

@@ -421,4 +421,6 @@ export default {
   'order.requireOrder.requestNo': '購買要求番号:',
   'order.requireOrder.feedbackInformation': 'フィードバック情報',
   'order.requireOrder.baojiadanshenhebutongguo': '見積書の審査が通らないんです',
+
+  'shop.other.hint': 'ヒント'
 };

src/locales/zh_CN/order.ts

@@ -435,6 +435,8 @@ export default {
   'order.requireOrder.feedbackInformation': '反馈信息',
   'order.requireOrder.baojiadanshenhebutongguo': '报价单审核不通过',
 
+  'shop.other.hint': '提示'
+
 
 
 

src/views/EnsureInquiryOrder/index.tsx

@@ -2,7 +2,7 @@
  * @Author: zhendong
  * @Date: 2023-03-02 13:54:08
  * @LastEditors: cgh
- * @LastEditTime: 2023-03-22 17:47:11
+ * @LastEditTime: 2023-05-17 16:29:41
  * @Description: 确认询价报价单-列表
  */
 
@@ -50,7 +50,7 @@ const FilltereInternalStatus = [
   { label: i18n.t('order:order.inquiry.index.allStatus', '所以状态'), value: '' },
   { label: i18n.t('order:order.tabs.audit', '待提交审核'), value: 1 },
   { label: i18n.t('order:order.tabs.audit1', '待审核(一级)'), value: 2 },
-  { label: i18n.t('order:oorder.tabs.audit2', '待审核(二级)'), value: 3 },
+  { label: i18n.t('order:order.tabs.audit2', '待审核(二级)'), value: 3 },
   { label: i18n.t('order:order.inquiry.index.innerStatus1', '审核不通过(一级)'), value: 7},
   { label: i18n.t('order:order.inquiry.index.innerStatus1', '审核不通过(二级)'), value: 8 },
   { label: i18n.t('order:order.inquiry.index.innerStatus3', '待确认'), value: 4 },