Merge remote-tracking branch 'origin/master'

zhc4dev
赵玉瑞 2 years ago
commit ffc9992e63
  1. 67
      ant-design-vue-jeecg/package.json
  2. 17
      ant-design-vue-jeecg/src/main.js
  3. 2
      ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
  4. 79
      ant-design-vue-jeecg/src/views/system/Depart3List.vue
  5. 43
      ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
  6. 2
      ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue

@ -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
}

@ -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);

@ -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: {

@ -7,11 +7,11 @@
<a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
<!--<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>-->
<!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!--<a-button type="primary" icon="import">导入</a-button>-->
<!--</a-upload>-->
<!--<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>-->
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row>
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
@ -28,7 +28,7 @@
<a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
<span style="user-select: none">
<a-tree
checkable
multiple
@select="onSelect"
@check="onCheck"
@ -78,9 +78,10 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="机构名称">
label="部门名称">
<a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
</a-form-item>
<template v-if="!orgCategoryDisabled">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
<a-tree-select
style="width:100%"
@ -91,45 +92,43 @@
placeholder="无">
</a-tree-select>
</a-form-item>
</template>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="机构编码">
<a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
label="部门编码">
<a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="机构类型">
label="部门类型">
<template v-if="orgCategoryDisabled">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1">
行政
管理机构
</a-radio>
<a-radio value="2">
教学
生产企业
</a-radio>
<a-radio value="4">
网店
</a-radio>
<a-radio value="5">
公司
门店
</a-radio>
<a-radio value="6">
供应商
</a-radio>
<a-radio value="7">
物流公司
</a-radio>
</a-radio-group>
</template>
<template v-else>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
<a-radio value="1">
行政
</a-radio>
<a-radio value="2">
教学
</a-radio>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="3">
班级
</a-radio>
<a-radio value="4">
分组
</a-radio>
<a-radio value="5">
公司
子部门
</a-radio>
</a-radio-group>
</template>
@ -170,9 +169,9 @@
</a-empty>
</a-card>
</a-tab-pane>
<a-tab-pane tab="部门权限" key="2" forceRender>
<depart-auth-modal ref="departAuth"/>
</a-tab-pane>
<!--<a-tab-pane tab="部门权限" key="2" forceRender>-->
<!--<depart-auth-modal ref="departAuth"/>-->
<!--</a-tab-pane>-->
</a-tabs>
</a-col>
@ -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: ''})

@ -15,10 +15,10 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="机构名称"
label="部门名称"
:hidden="false"
hasFeedback>
<a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
<a-input id="departName" placeholder="请输入部门/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
<a-tree-select
@ -33,36 +33,33 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="机构类型">
label="部门类型">
<template v-if="seen">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1">
行政
管理机构
</a-radio>
<a-radio value="2">
教学
生产企业
</a-radio>
<a-radio value="4">
网店
</a-radio>
<a-radio value="5">
公司
门店
</a-radio>
<a-radio value="6">
供应商
</a-radio>
<a-radio value="7">
物流公司
</a-radio>
</a-radio-group>
</template>
<template v-else>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
<a-radio value="1">
行政
</a-radio>
<a-radio value="2">
教学
</a-radio>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="3">
班级
</a-radio>
<a-radio value="4">
分组
</a-radio>
<a-radio value="5">
公司
子部门
</a-radio>
</a-radio-group>
</template>
@ -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: {

@ -30,7 +30,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: "QRCode",
components: {

Loading…
Cancel
Save