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

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 2 years ago
parent
046b5e3b54 fbcbb6b3f4
commit
661123878b
6 changed files with 143 additions and 128 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. 1
      src/views/activiti/ProcessModelList.vue
  2. 7
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  3. 7
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  4. 250
      src/views/activiti/todoManage.vue
  5. 4
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
  6. 2
      src/views/wastematerials/ProcessWasteMaterialsLists.vue

1
src/views/activiti/ProcessModelList.vue
Unescape View File

@ -758,6 +758,7 @@
// this.loadData(); // this.loadData();
}, },
loadData(arg) { loadData(arg) {
if(!this.url.list){ if(!this.url.list){
this.$message.error("请设置url.list属性!") this.$message.error("请设置url.list属性!")
return return

7
src/views/activiti/form/ProcessMaterialWarehousingForm.vue
Unescape View File

@ -649,8 +649,9 @@
httpAction(url, formData, method).then((res) => { httpAction(url, formData, method).then((res) => {
if (res.success) { if (res.success) {
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('afterSubmit', formData) if(e!=true){
this.$emit("close") this.$emit('afterSubmit', formData)
}
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
@ -768,7 +769,7 @@
}, },
saveAndpassTask() { saveAndpassTask() {
this.passTask() this.passTask()
this.handleSubmit(); this.handleSubmit(true);
}, },
validateError(msg) { validateError(msg) {
this.$message.error(msg) this.$message.error(msg)

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

@ -1350,7 +1350,7 @@
return return
} else { } else {
this.passTask(); this.passTask();
this.handleSubmit(); this.handleSubmit(true);
} }
} }
}) })
@ -1413,8 +1413,9 @@
httpAction(url, formData, method).then((res) => { httpAction(url, formData, method).then((res) => {
if (res.success) { if (res.success) {
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('afterSubmit', formData) if(e!=true){
this.$emit("close") this.$emit('afterSubmit', formData)
}
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }

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

@ -14,15 +14,15 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :xl="5" :md="6" :sm="8">--> <!-- <a-col :xl="5" :md="6" :sm="8">-->
<!-- <a-form-item label="委托人" prop="assignee">--> <!-- <a-form-item label="委托人" prop="assignee">-->
<!-- <a-input--> <!-- <a-input-->
<!-- type="text" allowClear--> <!-- type="text" allowClear-->
<!-- v-model="searchForm.assignee"--> <!-- v-model="searchForm.assignee"-->
<!-- placeholder="请输入"--> <!-- placeholder="请输入"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :xl="5" :md="6" :sm="8"> <a-col :xl="5" :md="6" :sm="8">
<a-form-item label="流程发起人" prop="applyer"> <a-form-item label="流程发起人" prop="applyer">
<a-input <a-input
@ -147,10 +147,12 @@
</div> </div>
</a-modal> </a-modal>
<!--流程表单--> <!--流程表单-->
<a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%"> <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%"
height="93%">
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
:processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType" :isSourceCapital="lcModa.isSourceCapital" :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType"
:task="true" :hieg ="lcModa.hieg" :isSourceCapital="lcModa.isSourceCapital"
:task="true" :hieg="lcModa.hieg"
@afterSubmit="afterSub" @afterSubmit="afterSub"
@passTask="()=>passTask(lcModa.processData)" @passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId" @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@ -166,7 +168,7 @@
<j-editor v-model="form.comment"></j-editor> <j-editor v-model="form.comment"></j-editor>
</a-form-item> </a-form-item>
<a-form-item label="下一审批人" prop="assignees" v-show="false" :error="error" > <a-form-item label="下一审批人" prop="assignees" v-show="false" :error="error">
<a-select <a-select
v-model="form.assignees" v-model="form.assignees"
placeholder="请选择" placeholder="请选择"
@ -255,7 +257,7 @@
// 搜索框对应data对象 // 搜索框对应data对象
name: '', name: '',
Id: '', Id: '',
applyer: "", applyer: '',
createTime_begin: '', createTime_begin: '',
createTime_end: '', createTime_end: '',
assignee: '' assignee: ''
@ -289,9 +291,11 @@
formComponent: null, formComponent: null,
isNew: false, isNew: false,
hieg: true, hieg: true,
isSourceCapital:false, isSourceCapital: false,
isPlanType: false isPlanType: false
}, },
tableName: '',
tableId: '',
url: { url: {
todoList: '/actTask/todoList', todoList: '/actTask/todoList',
pass: '/actTask/pass', pass: '/actTask/pass',
@ -310,12 +314,12 @@
labelCol: { labelCol: {
xs: { span: 1 }, xs: { span: 1 },
sm: { span: 2 }, sm: { span: 2 }
}, },
wrapperCol: { wrapperCol: {
xs: { span: 10 }, xs: { span: 10 },
sm: { span: 16 }, sm: { span: 16 }
}, }
} }
}, },
mounted() { mounted() {
@ -328,13 +332,13 @@
}, },
methods: { methods: {
onDateChange: function (value, dateString) { onDateChange: function(value, dateString) {
console.log(dateString[0],dateString[1]); console.log(dateString[0], dateString[1])
this.searchForm.createTime_begin=dateString[0]; this.searchForm.createTime_begin = dateString[0]
this.searchForm.createTime_end=dateString[1]; this.searchForm.createTime_end = dateString[1]
}, },
onDateOk(value) { onDateOk(value) {
console.log(value); console.log(value)
}, },
init() { init() {
this.getDataList() this.getDataList()
@ -380,7 +384,7 @@
}, },
/*审批提交的方法*/ /*审批提交的方法*/
handelSubmit() { handelSubmit() {
if(this.form.comment == ''){ if (this.form.comment == '') {
// console.log("zxzxzx++++++++",this.form.comment.toString().trim()) // console.log("zxzxzx++++++++",this.form.comment.toString().trim())
this.$message.error('请填写审批意见') this.$message.error('请填写审批意见')
return return
@ -406,10 +410,10 @@
this.$message.success('操作成功') this.$message.success('操作成功')
this.modalTaskVisible = false this.modalTaskVisible = false
this.getDataList() this.getDataList()
}else { } else {
console.log(res) console.log(res)
this.$message.error(res.message) this.$message.error(res.message)
return; return
} }
}) })
} else if (formData.type == 1) { } else if (formData.type == 1) {
@ -463,7 +467,7 @@
}) })
} }
}, },
async detail(r) { async detail(r) {
if (!r.routeName) { if (!r.routeName) {
this.$message.warning( this.$message.warning(
'该流程信息未配置表单，请联系开发人员！' '该流程信息未配置表单，请联系开发人员！'
@ -471,82 +475,83 @@
return return
} }
this.lcModa.disabled = true this.lcModa.disabled = true
this.tableName = r.tableName
//获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作） this.tableId = r.tableId
if (r.processName === '预算计划采购流程') { //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
let userInfo = sessionStorage.getItem('USER_INFORMATION') if (r.processName === '预算计划采购流程') {
let res = JSON.parse(userInfo) let userInfo = sessionStorage.getItem('USER_INFORMATION')
let param = {} let res = JSON.parse(userInfo)
// param.id = r.procDefId let param = {}
param.id = r.procInstId // param.id = r.procDefId
param.tableName = r.tableName param.id = r.procInstId
param.tableId = r.tableId param.tableName = r.tableName
param.username = res.username param.tableId = r.tableId
// let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param) param.username = res.username
// if (res2.success) { // let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param)
// if (res2.result) { // if (res2.success) {
// this.lcModa.isPlanType = true; // if (res2.result) {
// this.lcModa.isSourceCapital = true; // this.lcModa.isPlanType = true;
// this.lcModa.disabled = false; // this.lcModa.isSourceCapital = true;
// } // this.lcModa.disabled = false;
// } // }
// let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param) // }
// if (res1.success) { // let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param)
// if (res1.result) { // if (res1.success) {
// if (param.username==res1.result.username){ // if (res1.result) {
// this.lcModa.isPlanType = true; // if (param.username==res1.result.username){
// this.lcModa.isSourceCapital = true; // this.lcModa.isPlanType = true;
// this.lcModa.disabled = false; // this.lcModa.isSourceCapital = true;
// } // this.lcModa.disabled = false;
// } // }
// } // }
//获取当前节点审批名称审批人username // }
let res3=await this.getAction('/hy/processMaterialsAllot/getCurrent', param) //获取当前节点审批名称审批人username
if (res3.success) { let res3 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
if (res3.result) { if (res3.success) {
console.log(res.username,res3.result.relateId) if (res3.result) {
if(param.username==res3.result.relateId){ console.log(res.username, res3.result.relateId)
if ( res3.result.name=='生产供应站' || res3.result.name=='物装公司' || res3.result.name=='采购员' ){ if (param.username == res3.result.relateId) {
this.lcModa.isPlanType = true; if (res3.result.name == '生产供应站' || res3.result.name == '物装公司' || res3.result.name == '采购员') {
this.lcModa.isSourceCapital = true; this.lcModa.isPlanType = true
this.lcModa.disabled = false; this.lcModa.isSourceCapital = true
this.lcModa.hieg=false; this.lcModa.disabled = false
} this.lcModa.hieg = false
} }
} }
} }
} }
if (r.processName === '物资入库流程') { }
let userInfo = sessionStorage.getItem('USER_INFORMATION') if (r.processName === '物资入库流程') {
let res = JSON.parse(userInfo) let userInfo = sessionStorage.getItem('USER_INFORMATION')
let param = {} let res = JSON.parse(userInfo)
param.id = r.procInstId let param = {}
param.tableName = r.tableName param.id = r.procInstId
param.tableId = r.tableId param.tableName = r.tableName
param.username = res.username param.tableId = r.tableId
let res1=await this.getAction('/hy/processMaterialsAllot/getCurrent', param) param.username = res.username
if (res1.success) { let res1 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
if (res1.result) { if (res1.success) {
if(param.username==res1.result.relateId){ if (res1.result) {
if (res1.result.name=='采购员'){ if (param.username == res1.result.relateId) {
this.lcModa.isPlanType = true; if (res1.result.name == '采购员') {
this.lcModa.isSourceCapital = true; this.lcModa.isPlanType = true
this.lcModa.disabled = false; this.lcModa.isSourceCapital = true
} this.lcModa.disabled = false
} }
} }
} }
} }
this.lcModa.title = '查看流程业务信息：' + r.processName }
this.lcModa.formComponent = this.getFormComponent(r.routeName).component this.lcModa.title = '查看流程业务信息：' + r.processName
this.lcModa.processData = r this.lcModa.formComponent = this.getFormComponent(r.routeName).component
this.lcModa.isNew = false this.lcModa.processData = r
this.lcModa.task = true this.lcModa.isNew = false
this.lcModa.procInstId = r.procInstId this.lcModa.task = true
this.lcModa.visible = true this.lcModa.procInstId = r.procInstId
this.lcModa.visible = true
}, },
passTask(v) { passTask(v) {
console.log(v.procInstId,"33333333333333333") console.log(v.procInstId, '33333333333333333')
this.modalTaskTitle = '审批通过' this.modalTaskTitle = '审批通过'
this.form.id = v.id this.form.id = v.id
this.form.procInstId = v.procInstId this.form.procInstId = v.procInstId
@ -587,7 +592,11 @@
return return
} }
this.userLoading = true this.userLoading = true
this.getAction(this.url.getNode + v).then(res => { let param = {}
param.tableName = this.tableName
param.tableId = this.tableId
param.nodeId = v
this.getAction(this.url.getNode, param).then(res => {
this.userLoading = false this.userLoading = false
if (res.success) { if (res.success) {
if (res.result.users && res.result.users.length > 0) { if (res.result.users && res.result.users.length > 0) {
@ -676,9 +685,9 @@
} }
}) })
}, },
afterSub(){ afterSub() {
this.$message.success('保存成功') this.$message.success('保存成功')
this.lcModa.visible=false; this.lcModa.visible = false
this.lcModa.disabled = false this.lcModa.disabled = false
}, },
backAll() { backAll() {
@ -717,20 +726,23 @@
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/ .ant-modal {
overflow-y: hidden;
}
/deep/.ant-modal { /deep/ .ant-modal-content {
overflow-y: hidden; height: 100%;
} overflow-y: scroll;
/deep/.ant-modal-content{ }
height: 100%;
overflow-y: scroll; /deep/ .ant-modal-body {
} height: 100%;
/deep/.ant-modal-body{ /*overflow-y: scroll;*/
height: 100%; }
/*overflow-y: scroll;*/
} /deep/ .ant-modal {
/deep/.ant-modal{ top: 45px
top:45px }
}
</style> </style>

4
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
Unescape View File

@ -26,7 +26,7 @@
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="仓储地点"> <a-form-item label="仓储地点">
<a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/> <a-input placeholder="请输入仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="16"> <a-col :xl="5" :lg="7" :md="8" :sm="16">
@ -73,7 +73,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="5" :lg="7" :md="8" :sm="16"> <a-col :xl="5" :lg="7" :md="8" :sm="16">
<a-form-item label="入库批次"> <a-form-item label="入库批次">
<a-input placeholder="请选择批次" v-model="queryParam.supplierBatch"/> <a-input placeholder="请输入批次" v-model="queryParam.supplierBatch"/>
</a-form-item> </a-form-item>
</a-col> </a-col>

2
src/views/wastematerials/ProcessWasteMaterialsLists.vue
Unescape View File

@ -47,7 +47,7 @@
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="保质期"> <a-form-item label="保质期">
<a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"></a-input> <a-input placeholder="请输入保质期" v-model="queryParam.expirationDate"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">

Write Preview
Loading…
Cancel
Save