From fc8bd6021551581591588281fd8303acf5312430 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Fri, 23 Dec 2022 11:35:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=80=89=E6=8B=A9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index f457366..57f183b 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -586,7 +586,19 @@
             }
           }
           formData.describes = this.describes
-
+          if(formData.planType==1 && formData.materialType !=6){
+            if (!formData.ifDirect){
+              this.$message.error('请选择是否属于直达物资!')
+              return
+            }else {
+              if(formData.ifDirect==1){
+                if (!formData.ifInspection){
+                  this.$message.error('请选择是否需要送检!')
+                  return
+                }
+              }
+            }
+          }
           this.form.validateFields((err, values) => {
             if (!err) {
               formData.procDefId = this.processData.id
@@ -601,20 +613,8 @@
                 method = 'put'
               }
               console.log('格式化后的数据', formData)
-              if (this.btndisabled === false) {
-                this.btndisabled = true
-                httpAction(url, formData, method).then((res) => {
-                  if (res.success) {
-                    //this.$message.success('保存成功！')
-                    //todo 将表单的数据传给父组件
-                    this.$emit('afterSubmit', formData)
-                  } else {
-                    this.$message.error(res.message)
-                  }
-                }).finally(() => {
-                  this.btndisabled = false
-                })
-              }
+
+
             }
           })
         })

From b8371bc977ae8da7938fd882752325c2b9e4724e Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Fri, 23 Dec 2022 11:36:07 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=80=89=E6=8B=A9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 57f183b..d53590e 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -613,8 +613,20 @@
                 method = 'put'
               }
               console.log('格式化后的数据', formData)
-
-
+              if (this.btndisabled === false) {
+                this.btndisabled = true
+                httpAction(url, formData, method).then((res) => {
+                  if (res.success) {
+                    //this.$message.success('保存成功！')
+                    //todo 将表单的数据传给父组件
+                    this.$emit('afterSubmit', formData)
+                  } else {
+                    this.$message.error(res.message)
+                  }
+                }).finally(() => {
+                  this.btndisabled = false
+                })
+              }
             }
           })
         })

From c6d08dedc512b3c8183fc33453f29e3782443fc6 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Fri, 23 Dec 2022 11:40:05 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=80=89=E6=8B=A9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index d53590e..fd2d797 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -521,6 +521,19 @@
           } else {//总库没有目标库
             formData.targetLibrary = null
           }
+          if(formData.planType==1 && formData.materialType !=6){
+            if (!formData.ifDirect){
+              this.$message.error('请选择是否属于直达物资!')
+              return
+            }else {
+              if(formData.ifDirect==1){
+                if (!formData.ifInspection){
+                  this.$message.error('请选择是否需要送检!')
+                  return
+                }
+              }
+            }
+          }
           console.log('格式化后的数据', formData)
           this.form.validateFields((err, values) => {
             if (!err) {

From 53acf1defe077abd8d87aeb0917604f05470fa0e Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Fri, 23 Dec 2022 11:54:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index fd2d797..78cb553 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -472,6 +472,20 @@
             if (res.result.materialType == 1) {
               this.isTargetLibrary = true
             }
+            if (res.result.materialType!=6){
+              if (res.result.planType==1){
+                this.isIfDirect=true
+                //isIfInspection
+                if (res.result.ifDirect==1){
+                  this.isIfInspection=true
+                }
+              }else {
+                this.isIfDirect=false
+              }
+
+            }else {
+              this.isIfDirect=false
+            }
             let formData = res.result
             formData.tableName = r.tableName
             this.data = formData