Browse Source

提交物资流程模板页面

dev
long 2 years ago
parent
commit
5ceb579dea
  1. 2
      src/api/api.js
  2. 136
      src/components/jeecgbiz/JSelectCompany.vue
  3. 248
      src/components/jeecgbiz/modal/JSelectCompanyModal.vue
  4. 108
      src/views/activiti/form/ProcessMaterialBorrowingForm.vue
  5. 102
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  6. 104
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  7. 103
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  8. 103
      src/views/activiti/form/ProcessMaterialsReturnForm.vue
  9. 175
      src/views/activiti/form/ProcessOpinionForm.vue
  10. 100
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  11. 103
      src/views/activiti/form/ProcessSpecialMaterialsForm.vue
  12. 40
      src/views/activiti/form/ProcessUdgetPlanForm.vue

2
src/api/api.js

@ -38,6 +38,7 @@ const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermission
// 部门管理
const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
const queryCompanyTreeList = (params)=>getAction("/sys/sysCompany/queryTreeList",params);
const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
const queryParentName = (params)=>getAction("/sys/sysDepart/queryParentName",params);
const searchByKeywords = (params)=>getAction("/sys/sysDepart/searchBy",params);
@ -121,6 +122,7 @@ export {
getPermissionRuleList,
queryPermissionRule,
queryDepartTreeList,
queryCompanyTreeList,
queryIdTree,
queryParentName,
searchByKeywords,

136
src/components/jeecgbiz/JSelectCompany.vue

@ -0,0 +1,136 @@
<template>
<div class="components-input-demo-presuffix">
<!---->
<a-input @click="openModal" placeholder="请点击选择公司" v-model="departNames" readOnly :disabled="disabled">
<a-icon slot="prefix" type="cluster" title="公司选择控件"/>
<a-icon v-if="departIds" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
</a-input>
<j-select-company-modal
ref="innerDepartSelectModal"
:modal-width="modalWidth"
:multi="multi"
:rootOpened="rootOpened"
:depart-id="departIds"
@ok="handleOK"
@initComp="initComp"/>
</div>
</template>
<script>
import JSelectCompanyModal from './modal/JSelectCompanyModal'
export default {
name: 'JSelectCompany',
components:{
JSelectCompanyModal
},
props:{
modalWidth:{
type:Number,
default:500,
required:false
},
multi:{
type:Boolean,
default:false,
required:false
},
rootOpened:{
type:Boolean,
default:true,
required:false
},
value:{
type:String,
required:false
},
disabled:{
type: Boolean,
required: false,
default: false
},
// id
customReturnField: {
type: String,
default: 'id'
}
},
data(){
return {
visible:false,
confirmLoading:false,
departNames:"",
departIds:''
}
},
mounted(){
this.departIds = this.value
},
watch:{
value(val){
//update-begin-author:wangshuai date:20201124 for: JSelectDepart.vueid gitee I247X2
// if (this.customReturnField === 'id') {
this.departIds = val
// }
//update-end-author:wangshuai date:20201124 for: JSelectDepart.vueid gitee I247X2
}
},
methods:{
initComp(departNames){
this.departNames = departNames
//update-begin-author:lvdandan date:20200513 for:TESTA-438
//TODO ,
//idid
if(this.customReturnField !== 'id' && this.value){
const dataList = this.$refs.innerDepartSelectModal.dataList;
console.log('this.value',this.value)
this.departIds = this.value.split(',').map(item => {
const data = dataList.filter(d=>d[this.customReturnField] === item)
return data.length > 0 ? data[0].id : ''
}).join(',')
}
//update-end-author:lvdandan date:20200513 for:TESTA-438
},
openModal(){
this.$refs.innerDepartSelectModal.show()
},
handleOK(rows, idstr) {
let value = ''
if (!rows && rows.length <= 0) {
this.departNames = ''
this.departIds = ''
} else {
value = rows.map(row => row[this.customReturnField]).join(',')
this.departNames = rows.map(row => row['departName']).join(',')
this.departIds = idstr
}
this.$emit("change", value)
},
getDepartNames(){
return this.departNames
},
handleEmpty(){
this.handleOK('')
}
},
model: {
prop: 'value',
event: 'change'
}
}
</script>
<style scoped>
.components-input-demo-presuffix .anticon-close-circle {
cursor: pointer;
color: #ccc;
transition: color 0.3s;
font-size: 12px;
}
.components-input-demo-presuffix .anticon-close-circle:hover {
color: #f5222d;
}
.components-input-demo-presuffix .anticon-close-circle:active {
color: #666;
}
</style>

248
src/components/jeecgbiz/modal/JSelectCompanyModal.vue

@ -0,0 +1,248 @@
<template>
<j-modal
title="选择公司"
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@cancel="handleCancel"
switchFullscreen
cancelText="关闭">
<a-spin tip="Loading..." :spinning="false">
<a-input-search style="margin-bottom: 1px" placeholder="请输入公司名称按回车进行搜索" @search="onSearch" />
<a-tree
checkable
class="my-dept-select-tree"
:treeData="treeData"
:checkStrictly="true"
@check="onCheck"
@select="onSelect"
@expand="onExpand"
:autoExpandParent="autoExpandParent"
:expandedKeys="expandedKeys"
:checkedKeys="checkedKeys">
<template slot="title" slot-scope="{title}">
<span v-if="title.indexOf(searchValue) > -1">
{{title.substr(0, title.indexOf(searchValue))}}
<span style="color: #f50">{{searchValue}}</span>
{{title.substr(title.indexOf(searchValue) + searchValue.length)}}
</span>
<span v-else>{{title}}</span>
</template>
</a-tree>
</a-spin>
</j-modal>
</template>
<script>
import { queryCompanyTreeList } from '@/api/api'
export default {
name: 'JSelectCompanyModal',
props:['modalWidth','multi','rootOpened','departId'],
data(){
return {
visible:false,
confirmLoading:false,
treeData:[],
autoExpandParent:true,
expandedKeys:[],
dataList:[],
checkedKeys:[],
checkedRows:[],
searchValue:""
}
},
created(){
this.loadDepart();
},
watch:{
departId(){
this.initDepartComponent()
},
visible: {
handler() {
if (this.departId) {
this.checkedKeys = this.departId.split(",");
// console.log('this.departId', this.departId)
} else {
this.checkedKeys = [];
}
}
}
},
methods:{
show(){
this.visible=true
this.checkedRows=[]
this.checkedKeys=[]
},
loadDepart(){
queryCompanyTreeList().then(res=>{
if(res.success){
let arr = [...res.result]
this.reWriterWithSlot(arr)
this.treeData = arr
this.initDepartComponent()
if(this.rootOpened){
this.initExpandedKeys(res.result)
}
}
})
},
initDepartComponent(){
let names = ''
if(this.departId){
let currDepartId = this.departId
for(let item of this.dataList){
if(currDepartId.indexOf(item.key)>=0){
names+=","+item.title
}
}
if(names){
names = names.substring(1)
}
}
this.$emit("initComp",names)
},
reWriterWithSlot(arr){
for(let item of arr){
if(item.children && item.children.length>0){
this.reWriterWithSlot(item.children)
let temp = Object.assign({},item)
temp.children = {}
this.dataList.push(temp)
}else{
this.dataList.push(item)
item.scopedSlots={ title: 'title' }
}
}
},
initExpandedKeys(arr){
if(arr && arr.length>0){
let keys = []
for(let item of arr){
if(item.children && item.children.length>0){
keys.push(item.id)
}
}
this.expandedKeys=[...keys]
}else{
this.expandedKeys=[]
}
},
onCheck (checkedKeys,info) {
if(!this.multi){
let arr = checkedKeys.checked.filter(item => this.checkedKeys.indexOf(item) < 0)
this.checkedKeys = [...arr]
this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
}else{
this.checkedKeys = checkedKeys.checked
this.checkedRows = this.getCheckedRows(this.checkedKeys)
}
},
onSelect(selectedKeys,info) {
let keys = []
keys.push(selectedKeys[0])
if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
this.checkedKeys = [...keys]
this.checkedRows=[info.node.dataRef]
}else{
let currKey = info.node.dataRef.key
if(this.checkedKeys.indexOf(currKey)>=0){
this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
}else{
this.checkedKeys.push(...keys)
}
}
this.checkedRows = this.getCheckedRows(this.checkedKeys)
},
onExpand (expandedKeys) {
this.expandedKeys = expandedKeys
this.autoExpandParent = false
},
handleSubmit(){
if(!this.checkedKeys || this.checkedKeys.length==0){
this.$emit("ok",'')
}else{
this.$emit("ok",this.checkedRows,this.checkedKeys.join(","))
}
this.handleClear()
},
handleCancel(){
this.handleClear()
},
handleClear(){
this.visible=false
this.checkedKeys=[]
},
getParentKey(currKey,treeData){
let parentKey
for (let i = 0; i < treeData.length; i++) {
const node = treeData[i]
if (node.children) {
if (node.children.some(item => item.key === currKey)) {
parentKey = node.key
} else if (this.getParentKey(currKey, node.children)) {
parentKey = this.getParentKey(currKey, node.children)
}
}
}
return parentKey
},
onSearch(value){
const expandedKeys = this.dataList.map((item) => {
if (item.title.indexOf(value) > -1) {
return this.getParentKey(item.key,this.treeData)
}
return null
}).filter((item, i, self) => item && self.indexOf(item) === i)
Object.assign(this, {
expandedKeys,
searchValue: value,
autoExpandParent: true,
})
},
// checkedKeys rows
getCheckedRows(checkedKeys) {
const forChildren = (list, key) => {
for (let item of list) {
if (item.id === key) {
return item
}
if (item.children instanceof Array) {
let value = forChildren(item.children, key)
if (value != null) {
return value
}
}
}
return null
}
let rows = []
for (let key of checkedKeys) {
let row = forChildren(this.treeData, key)
if (row != null) {
rows.push(row)
}
}
return rows
}
}
}
</script>
<style lang="less" scoped>
// 便
.my-dept-select-tree{
height: 350px;
overflow-y: scroll;
}
</style>

108
src/views/activiti/form/ProcessMaterialBorrowingForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['updateFirm']" multi />
<j-select-company v-decorator="['updateFirm']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -66,14 +76,13 @@
import { getAction } from '@/api/manage'
import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
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"
export default {
name: 'ProcessMaterialBorrowingForm',
mixins: [JEditableTableMixin],
@ -84,6 +93,7 @@
JSelectDepart,
JSelectUserByDep,
JDictSelectTag,
JSelectCompany
},
data() {
return {
@ -221,6 +231,23 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
default: () => {
},
required: false
},
//data
formData: {
type: Object,
@ -262,8 +289,45 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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.processMaterialBorrowingListTable.dataSource=[]
@ -309,10 +373,44 @@
popupCallback(row){
this.form.setFieldsValue(pick(row,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','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;
})
}
})
},
}
}
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

102
src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -31,7 +31,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['materialType']" placeholder="请输入物资类型" style="width: 100%" />
<a-input-number v-decorator="['materialType']" placeholder="请输入物资类型" style="width: 100%" dictCode="material_type"/>
</a-form-item>
</a-col>
<a-col :span="12" >
@ -67,6 +67,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -77,8 +87,9 @@
import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
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'
@ -92,6 +103,7 @@
JUpload,
JSelectDepart,
JSelectUserByDep,
JSelectCompany
},
data() {
return {
@ -306,6 +318,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -347,8 +369,79 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processMaterialWarehousingListTable.dataSource=[]
@ -400,4 +493,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

104
src/views/activiti/form/ProcessMaterialsAllotForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -66,14 +76,13 @@
import { getAction } from '@/api/manage'
import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { validateDuplicateValue } from '@/utils/util'
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
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"
export default {
name: 'ProcessMaterialsAllotForm',
mixins: [JEditableTableMixin],
@ -84,6 +93,7 @@
JSelectDepart,
JSelectUserByDep,
JDictSelectTag,
JSelectCompany
},
data() {
return {
@ -222,6 +232,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -263,8 +283,79 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processMaterialsAllotListTable.dataSource=[]
@ -316,4 +407,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

103
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -68,12 +78,12 @@
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 JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
export default {
name: 'ProcessMaterialsDeliveryForm',
mixins: [JEditableTableMixin],
@ -84,6 +94,7 @@
JSelectDepart,
JSelectUserByDep,
JDictSelectTag,
JSelectCompany
},
data() {
return {
@ -229,6 +240,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -270,8 +291,79 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processMaterialsDeliveryListTable.dataSource=[]
@ -323,4 +415,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

103
src/views/activiti/form/ProcessMaterialsReturnForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -68,12 +78,12 @@
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 JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
export default {
name: 'ProcessMaterialsReturnForm',
mixins: [JEditableTableMixin],
@ -84,6 +94,7 @@
JSelectDepart,
JSelectUserByDep,
JDictSelectTag,
JSelectCompany
},
data() {
return {
@ -222,6 +233,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -263,8 +284,79 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processMaterialsReturnListTable.dataSource=[]
@ -316,4 +408,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

175
src/views/activiti/form/ProcessOpinionForm.vue

@ -0,0 +1,175 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form :form="form" slot="detail">
<a-row>
<!--<a-col :span="24">
<a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['createBy']" placeholder="请输入创建人" ></a-input>
</a-form-item>
</a-col>-->
<a-col :span="24">
<a-form-item label="流转意见" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-editor v-decorator="['opinion',{trigger:'input'}]" />
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-form-item label="删除标志" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['delFlag']" placeholder="请输入删除标志" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="删除时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择删除时间" v-decorator="['delTime']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>-->
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
<a-button @click="submitForm"> </a-button>
</a-col>
</a-row>
</a-form>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import pick from 'lodash.pick'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JEditor from '@/components/jeecg/JEditor'
export default {
name: 'ProcessOpinionForm',
components: {
JFormContainer,
JDate,
JEditor,
},
props: {
//data
formData: {
type: Object,
default: ()=>{},
required: false
},
//true false
formBpm: {
type: Boolean,
default: false,
required: false
},
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
form: this.$form.createForm(this),
model: {},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/hy/processOpinion/add",
edit: "/hy/processOpinion/edit",
queryById: "/hy/processOpinion/queryById"
}
}
},
computed: {
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){
return true
}
}
return false
}
},
created () {
//data
this.showFlowData();
},
methods: {
add () {
this.edit({});
},
edit (record) {
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'createBy','opinion','delFlag','delTime'))
})
},
//
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);
}
});
}
},
submitForm () {
const that = this;
//
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
let formData = Object.assign(this.model, values);
console.log("表单提交数据",formData)
httpAction(httpurl,formData,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'createBy','opinion','delFlag','delTime'))
},
}
}
</script>

100
src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -68,13 +78,13 @@
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 JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
export default {
name: 'ProcessSmaterialsScrapForm',
mixins: [JEditableTableMixin],
@ -86,6 +96,7 @@
JSelectUserByDep,
JDictSelectTag,
JSearchSelectTag,
JSelectCompany
},
data() {
return {
@ -223,6 +234,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -266,6 +287,74 @@
this.showFlowData();
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processSmaterialsScrapListTable.dataSource=[]
@ -317,4 +406,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

103
src/views/activiti/form/ProcessSpecialMaterialsForm.vue

@ -6,7 +6,7 @@
<a-row>
<a-col :span="12" >
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi />
<j-select-company v-decorator="['company']" multi />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -26,7 +26,7 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
</a-form-item>
</a-col>
<a-col :span="12" >
@ -57,6 +57,16 @@
:actionButton="true"/>
</a-tab-pane>
</a-tabs>
<div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
</a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button>
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
</a-spin>
</template>
@ -68,13 +78,13 @@
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 JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSelectCompany from '@/components/jeecgbiz/JSelectCompany'
export default {
name: 'ProcessSpecialMaterialsForm',
mixins: [JEditableTableMixin],
@ -86,6 +96,7 @@
JSelectUserByDep,
JDictSelectTag,
JSearchSelectTag,
JSelectCompany
},
data() {
return {
@ -215,6 +226,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -256,8 +277,79 @@
created () {
//data
this.showFlowData();
if (!this.isNew){
this.init();
}
},
methods: {
/*回显数据*/
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 = []
},
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;
})
}
})
},
addBefore(){
this.form.resetFields()
this.processSpecialMaterialsListTable.dataSource=[]
@ -309,4 +401,7 @@
</script>
<style scoped>
.div_process{
margin-top: 30px;
}
</style>

40
src/views/activiti/form/ProcessUdgetPlanForm.vue

@ -7,7 +7,7 @@
<a-row>
<a-col :span="12">
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['company']" multi/>
<j-select-company v-decorator="['company']" multi/>
</a-form-item>
</a-col>
<a-col :span="12">
@ -28,13 +28,13 @@
</a-col>
<a-col :span="12">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode=""
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型"/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程计划" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode=""
<j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode="process_plan"
placeholder="请选择流程计划"/>
</a-form-item>
</a-col>
@ -94,6 +94,7 @@
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import JUpload from '@/components/jeecg/JUpload'
import JSelectCompany from '@/components/jeecgbiz/JSelectCompany'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
@ -107,24 +108,7 @@
JSelectDepart,
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}
JSelectCompany
},
data() {
return {
@ -330,6 +314,16 @@
}
},
props: {
/*流程数据*/
processData:{
type:Object,
default:()=>{return {}},
required:false
},
/*是否新增*/
isNew: {type: Boolean, default: false, required: false},
/*是否处理流程*/
task: {type: Boolean, default: false, required: false},
//data
formData: {
type: Object,
@ -469,9 +463,9 @@
formData.filedNames = _.keys(values).join(",");
console.log('formData', values)
var url = this.url.addApply;
var url = this.url.add;
if (!this.isNew){
url = this.url.editForm;
url = this.url.edit;
}
this.btndisabled = true;
this.postFormAction(url,formData).then((res)=>{

Loading…
Cancel
Save