java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改采购表单

dev
long 2 years ago
parent
fa21a1f741
commit
8b7613675e
3 changed files with 114 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/views/activiti/form/ProcessUdgetPlan.vue
  2. 195
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  3. 31
      src/views/activiti/todoManage.vue

20
src/views/activiti/form/ProcessUdgetPlan.vue
Unescape View File

@ -1,8 +1,6 @@
<template> <template>
<a-card :bordered="true"> <a-card :bordered="true">
<a-tabs style="text-align: center" @change="changeTables">
<a-tab-pane tab="电商采购" key="1" v-if="onlineDisabled" forceRender>
<a-tabs style="text-align: center"> <a-tabs style="text-align: center">
<a-tab-pane tab="流程正文" key="1" forceRender> <a-tab-pane tab="流程正文" key="1" forceRender>
<process-udget-plan-form :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/> <process-udget-plan-form :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/>
@ -15,24 +13,6 @@
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-tab-pane>
<a-tab-pane tab="非电商采购" key="2" v-if="noDisabled" forceRender>
<a-tabs style="text-align: center">
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-udget-plan-form :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
</a-tabs>
</a-tab-pane>
</a-tabs>
<!-- <a-tabs style="text-align: center"> <!-- <a-tabs style="text-align: center">
<a-tab-pane tab="流程正文" key="1" forceRender> <a-tab-pane tab="流程正文" key="1" forceRender>

195
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -10,11 +10,6 @@
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/> <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['planType']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-user-by-dep v-decorator="['createBy']" disabled/> <j-select-user-by-dep v-decorator="['createBy']" disabled/>
@ -59,20 +54,31 @@
<a-col :span="8"> <a-col :span="8">
<a-form-item label="序号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['sort',validatorRules.sort]" placeholder="请输入序号" <a-input-number v-decorator="['sort',validatorRules.sort]" placeholder="请输入序号"
style="width: 100%" /> style="width: 100%"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-show="isPlanType">
<a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['planType']"
:trigger-change="true" dictCode="plan_type"
placeholder="请选择采购类型电商或非电商"/>
</a-form-item>
</a-col>
<a-col :span="8" v-show="isSourceCapital">
<a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['sourceCapital']"
:trigger-change="true" dictCode="source_capital"
placeholder="请选择资金来源"/>
</a-form-item>
</a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload> <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!--<a-col :span="24" >
<a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item>
</a-col>-->
</a-row> </a-row>
</a-form> </a-form>
</j-form-container> </j-form-container>
@ -92,21 +98,9 @@
:isabled="isabled" :isabled="isabled"
:rowSelection="true" :rowSelection="true"
:actionButton="true" :actionButton="true"
@shifu = "shifu" @shifu="shifu"
@descriptionFetch="fetchMerchandiseNews" @descriptionFetch="fetchMerchandiseNews"
> >
<!-- @selectRowChange="selectRowChange"-->
<!-- <template v-slot:group="props">-->
<!-- <a-auto-complete-->
<!-- v-decorator="[`materialGroup`]"-->
<!-- :data-source="bigIdRake"-->
<!-- placeholder="请选择"-->
<!-- @search="onSearchRake"-->
<!-- @select="onSelectRake(props,$event)"-->
<!-- />-->
<!-- </template>-->
<template v-slot:action="props"> <template v-slot:action="props">
<a-tooltip placement="top"> <a-tooltip placement="top">
<template v-slot:title="props"> <template v-slot:title="props">
@ -121,40 +115,6 @@
</a-tabs> </a-tabs>
<!-- <a-table :columns="columns" :data-source="data" bordered>-->
<!-- <template-->
<!-- v-for="col in ['name', 'age', 'address']"-->
<!-- :slot="col"-->
<!-- slot-scope="text, record, index"-->
<!-- >-->
<!-- <div :key="col">-->
<!-- <a-input-->
<!-- v-if="record.editable"-->
<!-- style="margin: -5px 0"-->
<!-- :value="text"-->
<!-- @change="e => handleChange(e.target.value, record.key, col)"-->
<!-- />-->
<!-- <template v-else>-->
<!-- {{ text }}-->
<!-- </template>-->
<!-- </div>-->
<!-- </template>-->
<!-- <template slot="operation" slot-scope="text, record, index">-->
<!-- <div class="editable-row-operations">-->
<!-- <span v-if="record.editable">-->
<!-- <a @click="() => save(record.key)">Save</a>-->
<!-- <a-popconfirm title="Sure to cancel?" @confirm="() => cancel(record.key)">-->
<!-- <a>Cancel</a>-->
<!-- </a-popconfirm>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <a :disabled="editingKey !== ''" @click="() => edit(record.key)">Edit</a>-->
<!-- </span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </a-table>-->
<j-form-container> <j-form-container>
<a-form :form="form"> <a-form :form="form">
<a-row> <a-row>
@ -177,7 +137,7 @@
</a-form-item> </a-form-item>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center"> <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="passTask">通过</a-button> <a-button type="primary" @click="passTask">通过</a-button>
<!-- <a-button type="primary" @click="ewrold">下载</a-button>--> <!-- <a-button type="primary" @click="ewrold">下载</a-button>-->
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button> <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item> </a-form-item>
</div> </div>
@ -259,6 +219,8 @@
// columns, // columns,
// editingKey: '', // editingKey: '',
isabled: true, isabled: true,
isPlanType: false,
isSourceCapital: false,
bigId: [], bigId: [],
opinion: '', opinion: '',
bigIdRake: [], bigIdRake: [],
@ -540,7 +502,8 @@
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
needTime: { rules: [{ required: true, message: '请选择需求时间!' }] }, needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }, processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个字符)'}, sort: {
rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个字符)' }
// { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'} // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
// {validator: this.lengthCheck} // {validator: this.lengthCheck}
] ]
@ -548,7 +511,7 @@
}, },
isBu: undefined, isBu: undefined,
planType: '', planType: '',
isShifu:false isShifu: false
} }
}, },
props: { props: {
@ -622,7 +585,7 @@
immediate: true, immediate: true,
handler: function(val) { handler: function(val) {
this.planType = val this.planType = val
console.log("this.planType---",this.planType) console.log('this.planType---', this.planType)
} }
} }
}, },
@ -636,7 +599,7 @@
// userInfo.company=company; // userInfo.company=company;
if (!this.isNew) { if (!this.isNew) {
this.init() this.init()
}else { } else {
this.popupCallback(company, userInfo) this.popupCallback(company, userInfo)
} }
// this.descriptionFetchDatas(); // this.descriptionFetchDatas();
@ -647,18 +610,18 @@
// this.form.setFieldsValue("materialGroup",123123); // this.form.setFieldsValue("materialGroup",123123);
}, },
methods: { methods: {
lengthCheck(rule, value, callback){ lengthCheck(rule, value, callback) {
if (value.toString().length >= 12 ){ if (value.toString().length >= 12) {
// console.log("长度太长了"); // console.log("长度太长了");
callback("长度应当在0 ~ 12 字符") callback('长度应当在0 ~ 12 字符')
} }
}, },
selectRowChange(a, b, c) { selectRowChange(a, b, c) {
// console.log("执行了",a,b,c); // console.log("执行了",a,b,c);
}, },
shifu(){ shifu() {
console.log("执行了"); console.log('执行了')
this.isShifu = true; this.isShifu = true
}, },
// handleChange(value, key, column) { // handleChange(value, key, column) {
@ -707,7 +670,7 @@
this.hiegs = false this.hiegs = false
// this.fetchData(); // this.fetchData();
// this.fetchDataRake() // this.fetchDataRake()
this.fetchMerchandiseNews(); this.fetchMerchandiseNews()
} }
}, },
//物料组选择触发 //物料组选择触发
@ -805,7 +768,7 @@
}, },
//table 值改变触发 //table 值改变触发
async onSelect (record) { async onSelect(record) {
let isEr = true let isEr = true
// if (!!record.row.materialGroup) { // if (!!record.row.materialGroup) {
@ -837,22 +800,22 @@
// } // }
// console.log("5555出发了",record.row); // console.log("5555出发了",record.row);
// if ( !!record.row.materialNumber && isEr) { // if ( !!record.row.materialNumber && isEr) {
let b = false; let b = false
if(this.isShifu){ if (this.isShifu) {
// console.log("0出发了",record); // console.log("0出发了",record);
for (const res of this.bigIdMerchandiseNewsList) { for (const res of this.bigIdMerchandiseNewsList) {
if(res.id === record.row.materialNumber ){ if (res.id === record.row.materialNumber) {
b = true; b = true
} }
} }
if(!b){ if (!b) {
// console.log("进来了111"); // console.log("进来了111");
await this.fetchMerchandiseNews(null,record.row.materialNumber ); await this.fetchMerchandiseNews(null, record.row.materialNumber)
} }
} }
this.isShifu = false; this.isShifu = false
if(record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity'){ if (record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity') {
if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) { if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
// console.log("2出发了"); // console.log("2出发了");
let materialName = {} let materialName = {}
this.bigIdMerchandiseNewsList.forEach(item => { this.bigIdMerchandiseNewsList.forEach(item => {
@ -868,7 +831,7 @@
} }
}) })
if (!!record.row.id && Object.keys(materialName).length > 0 ) { if (!!record.row.id && Object.keys(materialName).length > 0) {
await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => { await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
// console.log("bbbbbbbbbbbbbb",b) // console.log("bbbbbbbbbbbbbb",b)
b.forEach(item => { b.forEach(item => {
@ -890,14 +853,13 @@
] ]
// console.log("sadf1111") // console.log("sadf1111")
this.$refs.processUdgetPlanMaterial.setValues(values) this.$refs.processUdgetPlanMaterial.setValues(values)
return ; return
} }
}) })
}) })
this.processUdgetPlanMaterialTable.columns[0].options.push({ this.processUdgetPlanMaterialTable.columns[0].options.push({
title: materialName.materialClassify, title: materialName.materialClassify,
value: materialName.descriptionId value: materialName.descriptionId
@ -917,15 +879,13 @@
} }
] ]
this.$refs.processUdgetPlanMaterial.setValues(values) this.$refs.processUdgetPlanMaterial.setValues(values)
this.isBu = record.row.materialNumber; this.isBu = record.row.materialNumber
isEr = false isEr = false
} }
} }
} }
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr) {
if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr ) {
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
// console.log("3出发了"); // console.log("3出发了");
//如果单价大于5万 //如果单价大于5万
@ -955,13 +915,13 @@
} }
}, },
fetchMerchandiseNews(value,id) { //查询物料清单信息 fetchMerchandiseNews(value, id) { //查询物料清单信息
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject) => {
//查询大品类数据 //查询大品类数据
let par = { let par = {
delFlag: 0, delFlag: 0,
descriptionId: value, descriptionId: value,
id:id id: id
} }
this.bigIdMerchandiseNews = [] this.bigIdMerchandiseNews = []
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
@ -1012,12 +972,12 @@
}) })
}) })
} }
this.bigIdMerchandiseNewsList = res.result; this.bigIdMerchandiseNewsList = res.result
// resolve( this.bigIdMerchandiseNewsList ); // resolve( this.bigIdMerchandiseNewsList );
} }
resolve( this.bigIdMerchandiseNewsList ); resolve(this.bigIdMerchandiseNewsList)
})
}) })
});
}, },
// fetchMerchandiseNews(value){ //查询物料清单信息 // fetchMerchandiseNews(value){ //查询物料清单信息
@ -1116,8 +1076,8 @@
id: r.tableId id: r.tableId
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log("res.result.planType--",res.result.planType) console.log('res.result.planType--', res.result.planType)
this.$emit('planType',res.result.planType) this.$emit('planType', res.result.planType)
this.planType = res.result.planType this.planType = res.result.planType
let formData = res.result let formData = res.result
formData.tableName = r.tableName formData.tableName = r.tableName
@ -1202,8 +1162,8 @@
formData.procDefId = this.processData.id formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.planType=this.planType; formData.planType = this.planType
console.log("this.planType++",this.planType) console.log('this.planType++', this.planType)
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.addFromTableApply var url = this.url.addFromTableApply
let method = 'post' let method = 'post'
@ -1219,17 +1179,17 @@
} }
this.btndisabled = true this.btndisabled = true
console.log(formData, '表单数据') console.log(formData, '表单数据')
httpAction(url,formData,method).then((res)=>{ httpAction(url, formData, method).then((res) => {
if (res.success){ if (res.success) {
this.$message.success("提交申请成功！") this.$message.success('提交申请成功！')
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('loadData') this.$emit('loadData')
this.close(); this.close()
}else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
}).finally(()=>{ }).finally(() => {
this.btndisabled = false; this.btndisabled = false
}) })
} }
}) })
@ -1255,7 +1215,7 @@
} }
console.log(this.data, '数据回显') console.log(this.data, '数据回显')
let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion') let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
@ -1268,13 +1228,13 @@
} }
}, },
descriptionId(val){ descriptionId(val) {
let pam = { let pam = {
id: val id: val
} }
getAction(this.url.descriptionRakeUrlId,pam).then(res =>{ getAction(this.url.descriptionRakeUrlId, pam).then(res => {
if(res.success){ if (res.success) {
this.processUdgetPlanMaterialTable.columns[0].options.push({ this.processUdgetPlanMaterialTable.columns[0].options.push({
title: res.result.materialClassify, title: res.result.materialClassify,
value: res.result.id value: res.result.id
@ -1305,8 +1265,7 @@
for (let i = 0; i < this.listId.length; i++) { for (let i = 0; i < this.listId.length; i++) {
// console.log(this.listId[i])\ // console.log(this.listId[i])\
this.descriptionId(this.listId[i]); this.descriptionId(this.listId[i])
this.fetchMerchandiseNews(this.listId[i]) this.fetchMerchandiseNews(this.listId[i])
} }
@ -1388,7 +1347,7 @@
formData.procDefId = this.processData.id formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.planType=this.planType; formData.planType = this.planType
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.add var url = this.url.add
let method = 'post' let method = 'post'
@ -1398,16 +1357,16 @@
} }
this.btndisabled = true this.btndisabled = true
console.log(formData, '格式化的数据') console.log(formData, '格式化的数据')
httpAction(url,formData,method).then((res)=>{ httpAction(url, formData, method).then((res) => {
if (res.success){ if (res.success) {
//this.$message.success("保存成功！") //this.$message.success("保存成功！")
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('afterSubmit',formData) this.$emit('afterSubmit', formData)
}else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
}).finally(()=>{ }).finally(() => {
this.btndisabled = false; this.btndisabled = false
}) })
} }
}) })

31
src/views/activiti/todoManage.vue
Unescape View File

@ -467,17 +467,24 @@
return return
} }
this.lcModa.disabled = true this.lcModa.disabled = true
//获取是不是第一个审核人 //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
// if (r.processName === '物资调拨流程') { if (r.processName === '预算计划采购流程') {
// let userInfo = sessionStorage.getItem('USER_INFORMATION') let userInfo = sessionStorage.getItem('USER_INFORMATION')
// let res = JSON.parse(userInfo) let res = JSON.parse(userInfo)
// console.log('userInfo>>>>>>>>>>>', res.username) let param = {}
// let param = {} param.id = r.procDefId
// param.id = r.procDefId param.tableName = r.tableName
// param.tableName = r.tableName param.tableId = r.tableId
// param.tableId = r.tableId param.username = res.username
// param.username = res.username this.getAction('/hy/processMaterialsAllot/getOne', param).then(res => {
// this.getAction('/hy/processMaterialsAllot/getOne', param).then(res => { console.log('res>>>>>>>>>>>>>>>>>>', res)
if (res.success) {
if (res.result) {
this.lcModa.disabled = false
}
}
})
// this.getAction('/activiti_process/getNextNode', param).then(res => {
// console.log('res>>>>>>>>>>>>>>>>>>', res) // console.log('res>>>>>>>>>>>>>>>>>>', res)
// if (res.success) { // if (res.success) {
// if (res.result) { // if (res.result) {
@ -485,7 +492,7 @@
// } // }
// } // }
// }) // })
// } }
this.lcModa.title = '查看流程业务信息：' + r.processName this.lcModa.title = '查看流程业务信息：' + r.processName
this.lcModa.formComponent = this.getFormComponent(r.routeName).component this.lcModa.formComponent = this.getFormComponent(r.routeName).component
this.lcModa.processData = r this.lcModa.processData = r

Write Preview
Loading…
Cancel
Save