From 0cd8befad806f23cbd5b94e1629ca9e0c2a55287 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 28 Dec 2022 15:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=B8=8B=E8=BD=BD=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/form/ProcessMaterialsAllotForm.vue      |  2 +-
 src/views/activiti/form/ProcessUdgetPlanForm.vue     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 335fb63..b15ae34 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -43,7 +43,7 @@
           <a-col :span="8">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" @change="materialType"
-                                 v-decorator="['materialType']" :trigger-change="true"
+                                 v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
                                  dictCode="material_type" placeholder="请选择物资类型" :disabled="issh" />
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index db912ea..f596e9a 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -907,6 +907,8 @@
           //如果单价大于5万
           if (record.row.materialPrice > 50000) {
             this.materialPrice = record.row.materialPrice
+            console.log("record.row.materialPrice ",)
+            console.log(record.row.materialPrice)
           }
           //回填数据
           if (record.row.id !== undefined) {
@@ -1166,7 +1168,11 @@
             }
           }
           formData.fileId = getStringArry(formData.fileId)
-          formData.materialPrice = this.materialPrice
+           if (this.materialPrice!=0){
+             if (this.materialPrice!=0){
+            formData.materialPrice = this.materialPrice
+          }
+          }
           formData.describes = this.describes
           if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
             this.$message.error('需求时间不能小于当前流程发起时间')
@@ -1370,7 +1376,9 @@
             }
           }
           formData.fileId = getStringArry(formData.fileId)
-          formData.materialPrice = this.materialPrice
+           if (this.materialPrice!=0){
+            formData.materialPrice = this.materialPrice
+          }
           formData.describes = this.describes
           // if (this.isPlanType){
           //   if (!formData.planType){