diff --git a/.env.development b/.env.development index 1d21b3d..6743c2d 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ ENV = development # 本地环境接口地址 -VITE_API_URL = http://8.134.66.212:90 \ No newline at end of file +VITE_API_URL = http://58.252.252.77:90 \ No newline at end of file diff --git a/.env.production b/.env.production index 9159d3d..5d1474a 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ ENV = production # 线上环境接口地址 -VITE_API_URL = http://8.134.66.212:90 \ No newline at end of file +VITE_API_URL = http://58.252.252.77:90 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3d6b981..2fdb913 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.6.8", + "clipboard": "^2.0.11", "countup.js": "^2.8.0", "cropperjs": "^1.6.1", "echarts": "^5.5.0", @@ -2010,8 +2011,9 @@ }, "node_modules/clipboard": { "version": "2.0.11", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", + "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", + "license": "MIT", "dependencies": { "good-listener": "^1.2.2", "select": "^1.1.2", @@ -4495,8 +4497,9 @@ }, "node_modules/vue-clipboard3": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz", + "resolved": "https://registry.npmmirror.com/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz", "integrity": "sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==", + "license": "MIT", "dependencies": { "clipboard": "^2.0.6" } @@ -5984,7 +5987,7 @@ }, "clipboard": { "version": "2.0.11", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", + "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", "requires": { "good-listener": "^1.2.2", @@ -7769,7 +7772,7 @@ }, "vue-clipboard3": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz", + "resolved": "https://registry.npmmirror.com/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz", "integrity": "sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==", "requires": { "clipboard": "^2.0.6" diff --git a/package.json b/package.json index 9f5a1d3..aa17aa1 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.6.8", + "clipboard": "^2.0.11", "countup.js": "^2.8.0", "cropperjs": "^1.6.1", "echarts": "^5.5.0", diff --git a/src/api/list/index.ts b/src/api/list/index.ts index d21166e..9d63bf4 100644 --- a/src/api/list/index.ts +++ b/src/api/list/index.ts @@ -95,5 +95,13 @@ export function listApi() { params:data, }); }, + //删除某个发货订单 + invoiceOrderDeleteOrder: (data: object) => { + return request({ + url: '/api/Admin/InvoiceOrder/DeleteOrder', + method: 'post', + data, + }); + }, }; } diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index 8139c49..eab9fe6 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -63,6 +63,12 @@ export default { month:'Mnth', day:'Day', changedSuccessfully:'changed successfully', - PleaseSelectItemsFirstly:'Please select items firstlys' + PleaseSelectItemsFirstly:'Please select items firstlys', + language:'Language', + noData:'No Data', + success:'Success', + copy:'Copy', + deleteText:'Delete', + scqd:'Please confirm the deletion of the delivery note?' }, }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index e85e241..db58851 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -15,7 +15,7 @@ export default { selected: '已选中', items: '条数据', proceed: '去查看', - date: '采购日期', + date: '日期', status: '关闭状态', unclosed: '未关闭', partNumber: '物料编码', @@ -64,6 +64,12 @@ export default { month:'月', day:'日', changedSuccessfully:'修改成功', - PleaseSelectItemsFirstly:'请先选中数据' + PleaseSelectItemsFirstly:'请先选中数据', + language:'语言', + noData:'没有数据', + success:'成功', + copy:'复制', + deleteText:'删除', + scqd:'确定要删除该条送货单?' }, }; diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index abb9861..723cdae 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -1,13 +1,28 @@