guoyuji
2024-03-20 9bfecd6072fee5c4826bd7f17e4849bab383ca65
模板导出文件添加
7个文件已修改
2个文件已添加
56 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/package-lock.json 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/package.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/public/importTemplate.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/hook/downLoadFile.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/config.js
@@ -1,4 +1,4 @@
export default {
  serverUrl:"10.153.19.150:8086"
  serverUrl:"10.153.19.150:8080"
  //serverUrl:"res.abeim.cn"
}
north-glass-erp/northglass-erp/package-lock.json
@@ -24,6 +24,7 @@
        "xlsx": "^0.18.5"
      },
      "devDependencies": {
        "@types/node": "^20.11.30",
        "@types/sortablejs": "^1.15.7",
        "@vitejs/plugin-vue": "^4.3.4",
        "vite": "^4.4.9"
@@ -543,6 +544,15 @@
      "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
      "dependencies": {
        "@types/lodash": "*"
      }
    },
    "node_modules/@types/node": {
      "version": "20.11.30",
      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.11.30.tgz",
      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
      }
    },
    "node_modules/@types/sortablejs": {
@@ -1457,6 +1467,12 @@
        "node": ">=8.0"
      }
    },
    "node_modules/undici-types": {
      "version": "5.26.5",
      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
      "dev": true
    },
    "node_modules/unplugin": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.5.0.tgz",
@@ -1905,6 +1921,15 @@
      "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
      "requires": {
        "@types/lodash": "*"
      }
    },
    "@types/node": {
      "version": "20.11.30",
      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.11.30.tgz",
      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
      "dev": true,
      "requires": {
        "undici-types": "~5.26.4"
      }
    },
    "@types/sortablejs": {
@@ -2525,6 +2550,12 @@
        "is-number": "^7.0.0"
      }
    },
    "undici-types": {
      "version": "5.26.5",
      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
      "dev": true
    },
    "unplugin": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.5.0.tgz",
north-glass-erp/northglass-erp/package.json
@@ -24,6 +24,7 @@
    "xlsx": "^0.18.5"
  },
  "devDependencies": {
    "@types/node": "^20.11.30",
    "@types/sortablejs": "^1.15.7",
    "@vitejs/plugin-vue": "^4.3.4",
    "vite": "^4.4.9"
north-glass-erp/northglass-erp/public/importTemplate.xlsx
Binary files differ
north-glass-erp/northglass-erp/src/hook/downLoadFile.js
New file
@@ -0,0 +1,7 @@
export default function downloadFile(url,fileName){
       // 文件的URL地址
    const link = document.createElement('a');
    link.href = url;
    link.setAttribute('download', fileName);
    link.click();
}
north-glass-erp/northglass-erp/src/lang/en.js
@@ -90,7 +90,8 @@
        shape:'Shape',
        bendRadius:'Bend Radius',
        edgingType:'Edging Type',
        import:'import',
        import:'Import',
        template:'Template',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -91,6 +91,7 @@
        bendRadius:'弯钢弧度',
        edgingType:'磨边类型',
        import:'导入',
        template:'模板',
        msg:{
            productCheck:'请选择产品',
            tableLengthNot:'没有表格数据',
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -8,7 +8,8 @@
import  useUserInfoStore from '@/stores/userInfo'
import SelectProduct from "@/views/sd/product/SelectProduct.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import downLoadFile from "@/hook/downLoadFile"
import {useI18n} from "vue-i18n"
const { t } = useI18n()
@@ -602,6 +603,11 @@
  fileReader.readAsBinaryString(files[0])
}
//模板下载
const importTemplate = () => {
  downLoadFile('../../../../public/importTemplate.xlsx','importTemplate.xlsx')
}
//行单元格修改修改触发此事件
const editClosedEvent = ({ row, column }) => {
  //判断修改相应的数值修改面积与金额
@@ -769,6 +775,7 @@
          </div>
        </template>
        <template #toolbar_buttons>
          <vxe-button  @click="importTemplate">{{$t('order.template')}}</vxe-button>
          <vxe-button  @click="importEvent">{{$t('order.import')}}</vxe-button>
        </template>
north-glass-erp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
server:
  port: 8086
  port: 8080
spring: