From 9e53608e7245aaccc2bcfb56028f2c9629d710bc Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 21 Feb 2023 15:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue | 5 ++++-
src/views/activiti/form/ProcessUdgetPlanForm.vue | 7 ++++---
src/views/activiti/todoManage.vue | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 3069051..4de5a2d 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -1643,7 +1643,10 @@
}]
}
})
-
+ if(this.actualNumber){
+ // console.log(item,"===========");
+ item.actualSendNumber = null;
+ }
})
tab.dataSource = dataSource
typeof success === 'function' ? success(res) : ''
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 3aa68f9..ac98a67 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -62,14 +62,14 @@
style="width: 100%" disabled/>
</a-form-item>
</a-col>
- <a-col :span="8" v-show="isPlanType">
+ <a-col :span="8" v-if="isPlanType">
<a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['planType',validatorRules.planType]"
:trigger-change="true" dictCode="plan_type"
placeholder="请选择采购类型电商或非电商" @change="selectChangPlanType"/>
</a-form-item>
</a-col>
- <a-col :span="8" v-show="isSourceCapital">
+ <a-col :span="8" v-if="isSourceCapital">
<a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['sourceCapital',validatorRules.sourceCapital]"
:trigger-change="true" dictCode="source_capital"
@@ -1801,7 +1801,8 @@
formData.ifDirect = parseInt(formData.ifDirect);
formData.sourceCapital = parseInt(formData.sourceCapital);
formData.planType = parseInt(formData.planType);
- console.log(formData, '格式化的数据')
+ if(!!formData.ifInspection) formData.ifInspection = parseInt(formData.ifInspection);
+ console.log(formData, '格式化的数据');
if (this.btndisabled === false) {
this.btndisabled = true
httpAction(url, formData, method).then((res) => {
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index acb7f98..9fe785a 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -487,7 +487,7 @@
},
async detail(r) {
// console.log("rrrr==================rrrrrrr",r)
- if(r.name === '项目部经理' && r.processName === '物资出库流程'){
+ if(r.name === '项目部经理' && r.processName === '物资出库流程' || r.name === '所属项目部经理' && r.processName === '物资出库流程'){
// console.log("项目部经理 出库流程 ===")
this.lcModa.actualNumber = false;
}else{
@@ -587,7 +587,7 @@
this.lcModa.isTable=true;
},
passTask(v) {
- console.log(v.procInstId, '33333333333333333')
+ // console.log(v.procInstId, '33333333333333333')
this.modalTaskTitle = '审批通过'
this.form.id = v.id
this.form.procInstId = v.procInstId