1

package.json

@@ -42,6 +42,7 @@
     "@zxcvbn-ts/core": "^1.0.0-beta.0",
     "ant-design-vue": "3.2.20",
     "axios": "^0.24.0",
+    "moment": "^2.19.3",
     "cropperjs": "^1.5.12",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.5",
@@ -49,7 +50,6 @@
     "file-saver": "^2.0.5",
     "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
-    "moment": "^2.29.1",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.0",
     "pinia": "2.0.0",

src/App.vue

@@ -11,10 +11,15 @@
   import { AppProvider } from '/@/components/Application';
   import { useTitle } from '/@/hooks/web/useTitle';
   import { useLocale } from '/@/locales/useLocale';
-
+  import moment from 'moment';
+  import 'moment/locale/zh-cn';
+  import { onMounted } from 'vue';
   // support Multi-language
   const { getAntdLocale } = useLocale();
-
+  onMounted(() => {
+    console.log('moment');
+    moment.locale('zh-cn');
+  });
   // Listening to page changes and dynamically changing site titles
   useTitle();
 </script>

src/api/spares/index.ts

@@ -31,6 +31,7 @@ enum Api {
   partInStock = '/service/sale/part/inStock', //添加库存，入库
   repairAddPart = '/service/sale/repairPersonnel/repairAddPart', //维修中添加备件
   repairOver = '/service/sale/repairPersonnel/repairOver', //维修完成
+  repairOverRemark = '/service/sale/repairPersonnel/repairOverRemark', //维修完成
   getRepairOverRemark = '/service/sale/repairPersonnel/getRepairOverRemark', //维修完成
   partInStockLog = '/service/sale/part/inStockLog', //添加库存，入库 日志列表
   partInfoList = '/service/sale/supplyPersonnel/partInfo', //备件入库
@@ -406,6 +407,15 @@ export const repairOver = (params) =>
       ignoreCancelToken: true,
     },
   });
+export const repairOverRemark = (params) =>
+  defHttp.post<detailResult>({
+    url: Api.repairOverRemark,
+    params: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const getRepairOverRemark = (params) =>
   defHttp.post<detailResult>({
     url: Api.getRepairOverRemark,

src/locales/useLocale.ts

@@ -34,12 +34,14 @@ export function useLocale() {
   const getShowLocalePicker = computed(() => localeStore.getShowPicker);
 
   const getAntdLocale = computed((): any => {
+    console.log(getLocale, 'getLocale');
     return i18n.global.getLocaleMessage(unref(getLocale))?.antdLocale ?? {};
   });
 
   // Switching the language will change the locale of useI18n
   // And submit to configuration modification
   async function changeLocale(locale: LocaleType) {
+    console.log(locale, 'changeLocale');
     const globalI18n = i18n.global;
     const currentLocale = unref(globalI18n.locale);
     if (currentLocale === locale) {

src/main.ts

@@ -4,6 +4,7 @@ import 'virtual:windi-components.css';
 import 'virtual:windi-utilities.css';
 // Register icon sprite
 import 'virtual:svg-icons-register';
+import 'moment/dist/locale/zh-cn';
 import App from './App.vue';
 import { createApp } from 'vue';
 import { initAppConfigStore } from '/@/logics/initAppConfig';
@@ -24,7 +25,6 @@ if (import.meta.env.DEV) {
 
 async function bootstrap() {
   const app = createApp(App);
-
   // Configure store
   setupStore(app);
 

src/views/invoice/index.vue

@@ -46,6 +46,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { InvoiceList, InvoiceExport } from '/@/api/order';
   import { downloadByData } from '/@/utils/file/download';
+  import 'moment/dist/locale/zh-cn';
   import { searchForm, columns } from './data';
   import AddModal from './InvoiceModal.vue';
   import EditModal from './EditModal.vue';

src/views/work/remarksModal.vue

@@ -21,7 +21,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { updateRemark, getRepairOverRemark } from '/@/api/spares';
+  import { repairOverRemark, getRepairOverRemark } from '/@/api/spares';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
 
@@ -107,7 +107,7 @@
         loading.value = true;
         try {
           const params = await validate();
-          await updateRemark(params);
+          await repairOverRemark(params);
           closeModal();
           resetFields();
           createMessage.success(t('common.optSuccess'));

yarn.lock

@@ -8120,10 +8120,10 @@ modify-values@^1.0.0:
   resolved "https://registry.npmmirror.com/modify-values/-/modify-values-1.0.1.tgz"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@^2.29.1:
-  version "2.29.4"
-  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+moment@^2.19.3:
+  version "2.30.1"
+  resolved "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
 mozjpeg@^7.0.0:
   version "7.1.1"