diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index b6d1b8dd..b1b83cdb 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -10,63 +10,65 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@antv/data-set": "^0.11.4", - "@jeecg/antd-online-mini": "2.4.5-RC", - "@jiaminghi/data-view": "^2.10.0", - "@tinymce/tinymce-vue": "^2.1.0", - "@toast-ui/editor": "^2.1.2", "ant-design-vue": "^1.7.2", - "area-data": "^5.0.6", - "axios": "^0.27.2", - "clipboard": "^2.0.10", - "codemirror": "^5.65.1", - "cron-parser": "^2.10.0", + "@antv/data-set": "^0.11.4", + "viser-vue": "^2.4.8", + "axios": "^0.18.0", "dayjs": "^1.8.0", - "dircountdown": "^1.1.0", - "dom-align": "1.12.0", - "echarts": "^5.3.0", - "element-ui": "^2.15.6", "enquire.js": "^2.1.6", - "jquery": "^3.6.0", "js-cookie": "^2.2.0", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", "md5": "^2.2.1", "nprogress": "^0.2.0", - "qs": "^6.10.3", - "tinymce": "^5.10.3", - "viser-vue": "^2.4.8", "vue": "^2.6.10", - "vue-area-linkage": "^5.1.0", "vue-cropper": "^0.5.4", - "vue-i18n": "^8.27.0", + "vue-i18n": "^8.7.0", "vue-loader": "^15.7.0", "vue-ls": "^3.2.0", - "vue-photo-preview": "^1.0.9", - "vue-print-nb": "^1.7.5", - "vue-print-nb-jeecg": "^1.0.9", "vue-router": "^3.0.1", + "vuex": "^3.1.0", + "vue-print-nb-jeecg": "^1.0.10", + "clipboard": "^2.0.4", + "vue-photo-preview": "^1.1.3", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", - "vuex": "^3.1.0", + "codemirror": "^5.46.0", + "@tinymce/tinymce-vue": "2.1.0", + "tinymce": "5.4.1", + "@toast-ui/editor": "^2.1.2", + "vue-area-linkage": "^5.1.0", + "china-area-data": "^5.0.1", + "dom-align": "1.12.0", + "xe-utils": "2.4.8", "vxe-table": "2.9.13", "vxe-table-plugin-antd": "1.8.10", - "xe-utils": "2.4.8" + "cron-parser": "^2.10.0", + "qiankun": "^2.5.1", + "xss": "^1.0.13", + + "@jiaminghi/data-view": "^2.10.0", + "area-data": "^5.0.6", + "dircountdown": "^1.1.0", + "echarts": "^5.3.0", + "element-ui": "^2.15.6", + "jquery": "^3.6.0", + "qs": "^6.10.3" }, "devDependencies": { "@babel/polyfill": "^7.2.5", "@vue/cli-plugin-babel": "^3.3.0", - "@vue/cli-plugin-eslint": "^5.0.8", - "@vue/cli-service": "^5.0.8", + "@vue/cli-plugin-eslint": "^3.3.0", + "@vue/cli-service": "^3.3.0", "@vue/eslint-config-standard": "^4.0.0", "babel-eslint": "7.2.3", - "compression-webpack-plugin": "^10.0.0", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.1.0", - "html-webpack-plugin": "^4.2.0", "less": "^3.9.0", "less-loader": "^4.1.0", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "html-webpack-plugin": "^4.2.0", + "compression-webpack-plugin": "^3.1.0" }, "eslintConfig": { "root": true, @@ -104,10 +106,7 @@ "vue/html-closing-bracket-newline": 0, "vue/no-parsing-error": 0, "no-tabs": 0, - "indent": [ - "off", - 2 - ], + "indent": ["off", 2], "no-console": 0, "space-before-function-paren": 0 } diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index 11ee55ba..8271b441 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,11 +12,14 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; // YU-优化 -require('@jeecg/antd-online-mini') -require('@jeecg/antd-online-mini/dist/OnlineForm.css') - + require('@jeecg/antd-online-mini') + require('@jeecg/antd-online-mini/dist/OnlineForm.css') +// 引入 按需组件的统一引入文件 +//import './components/use' import Antd, { version } from 'ant-design-vue' -console.log('ant-design-vue version:', version) +// 按需引入所需组件，统一引入文件---优化 +//import './components/lazy_antd' +//console.log('ant-design-vue version:', version) import Viser from 'viser-vue' import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less' @@ -24,7 +27,7 @@ import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less' import '@/permission' // permission control import '@/utils/filter' // base filter // YU-优化 -//import Print from 'vue-print-nb-jeecg' +import Print from 'vue-print-nb-jeecg' import preview from 'vue-photo-preview' import 'vue-photo-preview/dist/skin.css' import SSO from '@/cas/sso.js' @@ -68,13 +71,15 @@ Vue.prototype.$axios=axios; Vue.prototype.rules = rules Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) +// 按需引入所需组件，统一引入文件---优化 Vue.use(Antd) + Vue.use(ElementUI); Vue.use(VueAxios, router) Vue.use(Viser) Vue.use(hasPermission) Vue.use(JDictSelectTag) -//Vue.use(Print) +Vue.use(Print) Vue.use(preview) Vue.use(vueBus); Vue.use(JeecgComponents); diff --git a/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue b/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue index dd6ff48d..9ca26091 100644 --- a/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue +++ b/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue @@ -29,7 +29,7 @@ import { httpAction } from '@/api/manage' import { validateDuplicateValue } from '@/utils/util' - import { Print } from 'vue-print-nb' + import { Print } from 'vue-print-nb-jeecg' export default { name: "MakerQRCode", components: { diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue index ba3fe20b..09bf3ebe 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue @@ -10,9 +10,16 @@ - - + + + + + + @@ -111,6 +118,8 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ZyClothsTypeModal from './modules/ZyClothsTypeModal' + import {filterObj} from "@/utils/util"; + import {getAction} from "@api/manage"; export default { name: 'ZyClothsTypeList', @@ -147,7 +156,7 @@ title:'类型名称', align:"center", dataIndex: 'typeName', - sorter:true + sorter:true, }, { title:'企业', @@ -174,7 +183,6 @@ deleteBatch: "/base/zyClothsType/deleteBatch", exportXlsUrl: "/base/zyClothsType/exportXls", importExcelUrl: "base/zyClothsType/importExcel", - }, dictOptions:{}, superFieldList:[], @@ -182,6 +190,7 @@ }, created() { this.getSuperFieldList(); + // this.loadParameter(); }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue index b632d2ef..b5fc7100 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue @@ -81,7 +81,7 @@ // ], typeName: [ { required: true, message: '请输入类型名称!'}, - { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,5}$/, message: '文本长度过长'}, + { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,50}$/, message: '文本长度过长'}, ], enterpriseId: [ { required: true, message: '请输入企业!'}, diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue index e98db90a..de072563 100644 --- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue +++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue @@ -7,11 +7,11 @@ 添加部门 添加下级 - 导出 - - 导入 - - 批量删除 + + + + +
@@ -28,7 +28,7 @@ + label="部门名称"> + - + label="部门编码"> + + label="部门类型"> @@ -170,9 +169,9 @@ - - - + + + @@ -189,16 +188,16 @@ // 表头 const columns = [ { - title: '机构名称', + title: '部门名称', dataIndex: 'departName' }, { - title: '机构类型', + title: '部门类型', align: 'center', dataIndex: 'orgType' }, { - title: '机构编码', + title: '部门编码', dataIndex: 'orgCode', }, { @@ -273,9 +272,9 @@ edges: [] }, validatorRules: { - departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]}, - orgCode: {rules: [{required: true, message: '请输入机构编码!'}]}, - orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]}, + departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]}, + orgCode: {rules: [{required: true, message: '请输入部门编码!'}]}, + orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]}, mobile: {rules: [{validator: this.validateMobile}]} }, url: { @@ -447,10 +446,10 @@ }, // 触发onSelect事件时,为部门树右侧的form表单赋值 setValuesToForm(record) { - if(record.orgCategory == '1'){ - this.orgCategoryDisabled = true; + if(record.orgCategory == '3'){ + this.orgCategoryDisabled =false ; }else{ - this.orgCategoryDisabled = false; + this.orgCategoryDisabled =true; } this.$nextTick(() => { this.form.getFieldDecorator('fax', {initialValue: ''}) diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue index 7a7d1b17..13ba6789 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue @@ -15,10 +15,10 @@ - + + label="部门类型"> @@ -138,8 +135,8 @@ confirmLoading: false, form: this.$form.createForm(this), validatorRules: { - departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]}, - orgCode: {rules: [{required: true, message: '请输入机构编码!'}]}, + departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]}, + orgCode: {rules: [{required: true, message: '请输入部门编码!'}]}, mobile: {rules: [{validator: this.validateMobile}]} }, url: { diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue index fe33b498..25ab0f22 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue @@ -1,11 +1,12 @@