diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index d92eda9..2d88c5a 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -2,9 +2,9 @@
- - - + + + - - - - - + + + + + @@ -38,18 +38,18 @@ 欢迎您，{{ nickname() }} - - - - 个人中心 - - - - - - 账户设置 - - + + + + + + + + + + + + 系统设置 @@ -58,10 +58,10 @@ 密码修改 - - - 切换部门 - + + + + 清理缓存 diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index a98bc9d..5fe9563 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -1,58 +1,62 @@ @@ -74,16 +88,15 @@ import pick from 'lodash.pick' import { getAction } from '@/api/manage' - import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil' + import { FormTypes, getRefPromise } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { validateDuplicateValue } from '@/utils/util' import JFormContainer from '@/components/jeecg/JFormContainer' - import JDate from '@/components/jeecg/JDate' + import JDate from '@/components/jeecg/JDate' import JUpload from '@/components/jeecg/JUpload' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' - import JDictSelectTag from "@/components/dict/JDictSelectTag" - + import JDictSelectTag from '@/components/dict/JDictSelectTag' export default { name: 'ProcessUdgetPlanForm', mixins: [JEditableTableMixin], @@ -95,30 +108,47 @@ JSelectUserByDep, JDictSelectTag, }, + props:{ + /*全局禁用，可表示查看*/ + disabled:{ + type:Boolean, + default:false, + required:false + }, + /*流程数据*/ + processData:{ + type:Object, + default:()=>{return {}}, + required:false + }, + /*是否新增*/ + isNew: {type: Boolean, default: false, required: false}, + /*是否处理流程*/ + task: {type: Boolean, default: false, required: false} + }, data() { return { labelCol: { xs: { span: 24 }, - sm: { span: 6 }, + sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 16 }, + sm: { span: 16 } }, labelCol2: { xs: { span: 24 }, - sm: { span: 3 }, + sm: { span: 3 } }, wrapperCol2: { xs: { span: 24 }, - sm: { span: 20 }, + sm: { span: 20 } }, // 新增时子表默认添加几行空数据 addDefaultRowNum: 1, - validatorRules: { - }, - refKeys: ['processUdgetPlanMaterial', ], - tableKeys:['processUdgetPlanMaterial', ], + validatorRules: {}, + refKeys: ['processUdgetPlanMaterial'], + tableKeys: ['processUdgetPlanMaterial'], activeKey: 'processUdgetPlanMaterial', // 预算计划采购流程物料清单表 processUdgetPlanMaterialTable: { @@ -129,179 +159,182 @@ title: '物料组', key: 'materialGroup', type: FormTypes.sel_search, - dictCode:"", - width:"200px", + dictCode: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '物料号', key: 'materialNumber', type: FormTypes.sel_search, - dictCode:"", - width:"200px", + dictCode: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '物料描述', key: 'materialDescription', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '仓储地点_id', key: 'unitWasteWarehouseCodeId', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '生产时间', key: 'productionTime', type: FormTypes.date, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '保质期', key: 'expirationDate', type: FormTypes.date, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '是否到货', key: 'arrivalNotice', type: FormTypes.inputNumber, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '入库时间', key: 'storageTime', type: FormTypes.date, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '入库人', key: 'librarySign', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '核算属性', key: 'materialType', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '物料名称及规格型号', key: 'materialName', type: FormTypes.sel_search, - dictCode:"", - width:"200px", + dictCode: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '系列', key: 'materialSeries', type: FormTypes.sel_search, - dictCode:"", - width:"200px", + dictCode: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '单位', key: 'materialUnit', type: FormTypes.select, - dictCode:"", - width:"200px", + dictCode: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '单价', key: 'materialPrice', type: FormTypes.inputNumber, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '对比单价', key: 'contrastPrice', type: FormTypes.popup, - popupCode:"", - destFields:"", - orgFields:"", - width:"200px", + popupCode: '', + destFields: '', + orgFields: '', + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '数量', key: 'materialQuantity', type: FormTypes.inputNumber, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '金额', key: 'materialAmount', type: FormTypes.inputNumber, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '执行标准', key: 'materialStandard', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', + defaultValue: '' }, { title: '备注', key: 'remarks', type: FormTypes.input, - width:"200px", + width: '200px', placeholder: '请输入${title}', - defaultValue:'', - }, + defaultValue: '' + } ] }, url: { - add: "/hy/processUdgetPlan/add", - edit: "/hy/processUdgetPlan/edit", - queryById: "/hy/processUdgetPlan/queryById", + getForm:'/actBusiness/getForm', + add: '/hy/processUdgetPlan/add', + edit: '/hy/processUdgetPlan/edit', + queryById: '/hy/processUdgetPlan/queryById', processUdgetPlanMaterial: { list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId' - }, - } + } + }, + btndisabled: false } }, props: { //流程表单data formData: { type: Object, - default: ()=>{}, + default: () => { + }, required: false }, //表单模式：false流程表单 true普通表单 @@ -318,32 +351,70 @@ } }, computed: { - formDisabled(){ - if(this.formBpm===true){ - if(this.formData.disabled===false){ + formDisabled() { + if (this.formBpm === true) { + if (this.formData.disabled === false) { return false } return true } return this.disabled }, - showFlowSubmitButton(){ - if(this.formBpm===true){ - if(this.formData.disabled===false){ + showFlowSubmitButton() { + if (this.formBpm === true) { + if (this.formData.disabled === false) { return true } } return false } }, - created () { + created() { //如果是流程中表单，则需要加载流程表单data - this.showFlowData(); + console.log("流程数据",this.processData) + this.showFlowData() + if (!this.isNew){ + this.init(); + } }, methods: { - addBefore(){ + /*回显数据*/ + init(){ + this.btndisabled = true; + var r = this.processData; + this.getAction(this.url.getForm,{ + tableId:r.tableId, + tableName:r.tableName, + }).then((res)=>{ + if (res.success){ + let formData = res.result; + formData.tableName = r.tableName; + this.data = formData; + console.log("表单回显数据",this.data) + this.$nextTick(() => { + this.form.setFieldsValue(pick(this.data,'name')) + }); + this.btndisabled = false; + }else { + this.$message.error(res.message) + } + }) + }, + close() { + //todo 关闭后的回调 + this.$emit('close') + }, + /*通过审批*/ + passTask() { + this.$emit('passTask') + }, + /*驳回审批*/ + backTask() { + this.$emit('backTask') + }, + addBefore() { this.form.resetFields() - this.processUdgetPlanMaterialTable.dataSource=[] + this.processUdgetPlanMaterialTable.dataSource = [] }, getAllTable() { let values = this.tableKeys.map(key => getRefPromise(this, key)) @@ -351,7 +422,7 @@ }, /** 调用完edit()方法之后会自动调用此方法 */ editAfter() { - let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processPlan','needTime','orderNumber','fileId') + let fieldval = pick(this.model, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId') this.$nextTick(() => { this.form.setFieldsValue(fieldval) }) @@ -366,30 +437,64 @@ let main = Object.assign(this.model, allValues.formValue) return { ...main, // 展开 - processUdgetPlanMaterialList: allValues.tablesValue[0].values, + processUdgetPlanMaterialList: allValues.tablesValue[0].values } }, //渲染流程表单数据 - showFlowData(){ - if(this.formBpm === true){ - let params = {id:this.formData.dataId}; - getAction(this.url.queryById,params).then((res)=>{ - if(res.success){ - this.edit (res.result); + showFlowData() { + if (this.formBpm === true) { + let params = { id: this.formData.dataId } + getAction(this.url.queryById, params).then((res) => { + if (res.success) { + this.edit(res.result) } }) } }, - validateError(msg){ + validateError(msg) { this.$message.error(msg) }, - popupCallback(row){ - this.form.setFieldsValue(pick(row,'company','createTime','sysOrgCode','createBy','materialType','processPlan','needTime','orderNumber','fileId')) - }, + popupCallback(row) { + this.form.setFieldsValue(pick(row, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')) + }, + // handler + handleSubmit (e) { + e.preventDefault() + this.form.validateFields((err, values) => { + if (!err) { + let formData = Object.assign(this.data||{}, values) + formData.procDefId = this.processData.id; + formData.procDeTitle = this.processData.name; + if (!formData.tableName)formData.tableName = this.processData.businessTable; + formData.filedNames = _.keys(values).join(","); + console.log('formData', values) + + var url = this.url.addApply; + if (!this.isNew){ + url = this.url.editForm; + } + this.btndisabled = true; + this.postFormAction(url,formData).then((res)=>{ + if (res.success){ + this.$message.success("保存成功！") + //todo 将表单的数据传给父组件 + this.$emit('afterSubmit',formData) + }else { + this.$message.error(res.message) + } + }).finally(()=>{ + this.btndisabled = false; + }) + } + }) + }, } } \ No newline at end of file diff --git a/src/views/activiti/mixins/activitiMixin.js b/src/views/activiti/mixins/activitiMixin.js index f17da4b..1902812 100644 --- a/src/views/activiti/mixins/activitiMixin.js +++ b/src/views/activiti/mixins/activitiMixin.js @@ -18,53 +18,59 @@ export const activitiMixin = { /*todo 所有的流程表单，组件化注册，在此维护*/ allFormComponent:function(){ return [ + { + text:'测试流程表单', + routeName:'@/views/activiti/form/demoForm', + component:() => import(`@/views/activiti/form/demoForm`), + businessTable:'test_demo' + }, { text:'预算计划采购流程', routeName:'@/views/activiti/form/ProcessUdgetPlanForm', component:() => import(`@/views/activiti/form/ProcessUdgetPlanForm`), - businessTable:'ProcessUdgetPlanForm' + businessTable:'process_udget_plan' }, { text:'物资入库流程', routeName:'@/views/activiti/form/ProcessMaterialWarehousingForm', component:() => import(`@/views/activiti/form/ProcessMaterialWarehousingForm`), - businessTable:'ProcessMaterialWarehousingForm' + businessTable:'process_material_warehousing' }, { text:'物资出库流程', routeName:'@/views/activiti/form/ProcessMaterialsDeliveryForm', component:() => import(`@/views/activiti/form/ProcessMaterialsDeliveryForm`), - businessTable:'ProcessMaterialsDeliveryForm' + businessTable:'process_materials_delivery' }, { text:'物资调拨流程', routeName:'@/views/activiti/form/ProcessMaterialsAllotForm', component:() => import(`@/views/activiti/form/ProcessMaterialsAllotForm`), - businessTable:'ProcessMaterialsAllotForm' + businessTable:'process_materials_allot' }, { text:'物资借用流程', routeName:'@/views/activiti/form/ProcessMaterialBorrowingForm', component:() => import(`@/views/activiti/form/ProcessMaterialBorrowingForm`), - businessTable:'ProcessMaterialBorrowingForm' + businessTable:'process_material_borrowing' }, { text:'物资归还流程', routeName:'@/views/activiti/form/ProcessMaterialsReturnForm', component:() => import(`@/views/activiti/form/ProcessMaterialsReturnForm`), - businessTable:'ProcessMaterialsReturnForm' + businessTable:'process_materials_return' }, { text:'物资报废流程', routeName:'@/views/activiti/form/ProcessSmaterialsScrapForm', component:() => import(`@/views/activiti/form/ProcessSmaterialsScrapForm`), - businessTable:'ProcessSmaterialsScrapForm' + businessTable:'process_smaterials_scrap' }, { text:'特殊物资审批流程', routeName:'@/views/activiti/form/ProcessSpecialMaterialsForm', component:() => import(`@/views/activiti/form/ProcessSpecialMaterialsForm`), - businessTable:'ProcessSpecialMaterialsForm' + businessTable:'process_special_materials' }, ] },