purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除单据多余的字段

Browse Source
This commit is contained in:
季圣华
2021-07-22 22:59:23 +08:00
parent dd73a0d1e1
commit 8ca5c9bf06
5 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-web/src/api/api.js
View File

@@ -48,7 +48,7 @@ const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermission
//机构管理
const queryOrganizationTreeList = (params)=>getAction("/organization/getOrganizationTree",params);
const queryOrganizationById = (params)=>getAction("/organization/findById",params);
const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
const checkOrganization = (params)=>getAction("/organization/checkIsNameExist",params);
const queryParentName = (params)=>getAction("/sys/sysDepart/queryParentName",params);
const searchByKeywords = (params)=>getAction("/sys/sysDepart/searchBy",params);
const deleteByDepartId = (params)=>deleteAction("/sys/sysDepart/delete",params);
@@ -195,6 +195,7 @@ export {
queryPermissionRule,
queryOrganizationTreeList,
queryOrganizationById,
checkOrganization,
queryParentName,
searchByKeywords,
deleteByDepartId,

6
jshERP-web/src/components/layouts/TabLayout.vue
View File

@@ -121,6 +121,8 @@
let oldIndex = this.linkList.indexOf(newRoute.fullPath)
let oldPositionRoute = this.pageList[oldIndex]
this.pageList.splice(oldIndex, 1, Object.assign({},newRoute,{meta:oldPositionRoute.meta}))
//每次切换都刷新
this.routeReload()
}
},
'activePage': function(key) {
@@ -194,10 +196,12 @@
this.$message.warning('这是最后一页，不能再关闭了啦')
return
}
console.log("this.pageList ",this.pageList );
console.log("this.pageList ",this.pageList);
this.pageList = this.pageList.filter(item => item.fullPath !== key)
console.log("this.pageList ",this.pageList);
let index = this.linkList.indexOf(key)
this.linkList = this.linkList.filter(item => item !== key)
console.log("this.linkList ",this.linkList);
index = index >= this.linkList.length ? this.linkList.length - 1 : index
this.activePage = this.linkList[index]
},

2
jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
View File

@@ -101,7 +101,7 @@
this.visible = true;
this.loadTreeData();
this.$nextTick(() => {
this.form.setFieldsValue(pick(record, 'orgFullName','orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
this.form.setFieldsValue(pick(record, 'name','serialNo', 'parentId', 'sort', 'remark'))
});
},
close () {

37
jshERP-web/src/views/system/OrganizationList.vue
View File

@@ -61,11 +61,8 @@
<a-col :md="12" :sm="24">
<a-card :bordered="false" v-if="selectedKeys.length>0">
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="全称">
<a-input placeholder="请输入全称" v-decorator="['orgFullName', validatorRules.orgFullName ]"/>
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="简称">
<a-input placeholder="请输入简称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
<a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/>
@@ -100,7 +97,7 @@
<script>
import OrganizationModal from './modules/OrganizationModal'
import pick from 'lodash.pick'
import {queryOrganizationTreeList,queryOrganizationById, searchByKeywords, deleteByDepartId} from '@/api/api'
import {queryOrganizationTreeList,queryOrganizationById, checkOrganization, deleteByDepartId} from '@/api/api'
import {httpAction, deleteAction} from '@/api/manage'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
export default {
@@ -146,8 +143,12 @@ export default {
edges: []
},
validatorRules: {
orgFullName: {rules: [{required: true, message: '请输入全称!'}]},
orgAbr: {rules: [{required: true, message: '请输入简称!'}]},
orgAbr: {
rules: [
{ required: true, message: '请输入名称!'},
{ validator: this.validateName}
]
},
orgNo: {rules: [{required: true, message: '请输入编码!'}]}
},
url: {
@@ -287,7 +288,6 @@ export default {
queryOrganizationById(params).then((res) => {
if (res && res.code == 200) {
if(res.data){
record.orgFullName = res.data.orgFullName;
record.orgAbr = res.data.orgAbr;
record.orgNo = res.data.orgNo;
record.parentId = res.data.parentId;
@@ -306,7 +306,7 @@ export default {
// 触发onSelect事件时,为机构树右侧的form表单赋值
setValuesToForm(record) {
this.$nextTick(() => {
this.form.setFieldsValue(pick(record, 'orgFullName','orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
this.form.setFieldsValue(pick(record, 'orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
})
},
getCurrSelectedTitle() {
@@ -363,6 +363,23 @@ export default {
openSelect() {
this.$refs.sysDirectiveModal.show()
},
validateName(rule, value, callback){
let params = {
name: value,
id: this.model.id?this.model.id:0
};
checkOrganization(params).then((res)=>{
if(res && res.code===200) {
if(!res.data.status){
callback();
} else {
callback("名称已经存在");
}
} else {
callback(res.data);
}
});
},
handleAdd() {
this.$refs.organizationModal.add()
this.$refs.organizationModal.title = '新增'

36
jshERP-web/src/views/system/modules/OrganizationModal.vue
View File

@@ -12,11 +12,8 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="全称">
<a-input placeholder="请输入全称" v-decorator="['orgFullName', validatorRules.orgFullName ]"/>
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="简称">
<a-input placeholder="请输入简称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
<a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/>
@@ -40,7 +37,7 @@
<script>
import { httpAction } from '@/api/manage'
import { queryOrganizationTreeList } from '@/api/api'
import { queryOrganizationTreeList, checkOrganization } from '@/api/api'
import pick from 'lodash.pick'
import ATextarea from 'ant-design-vue/es/input/TextArea'
export default {
@@ -70,8 +67,12 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules:{
orgFullName: {rules: [{required: true, message: '请输入全称!'}]},
orgAbr: {rules: [{required: true, message: '请输入简称!'}]},
orgAbr: {
rules: [
{ required: true, message: '请输入名称!'},
{ validator: this.validateName}
]
},
orgNo: {rules: [{required: true, message: '请输入编码!'}]}
},
url: {
@@ -105,7 +106,7 @@
this.visible = true;
this.loadTreeData();
this.$nextTick(() => {
this.form.setFieldsValue(pick(record, 'orgFullName','orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
this.form.setFieldsValue(pick(record, 'orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
});
},
close () {
@@ -139,6 +140,23 @@
},
handleCancel () {
this.close()
},
validateName(rule, value, callback){
let params = {
name: value,
id: this.model.id?this.model.id:0
};
checkOrganization(params).then((res)=>{
if(res && res.code===200) {
if(!res.data.status){
callback();
} else {
callback("名称已经存在");
}
} else {
callback(res.data);
}
});
}
}
}