From bfe9ca4115de846ce7b414a13acc62e773e5bca4 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 2 Dec 2022 16:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5,=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue   |  3 +++
 .../activiti/form/ProcessUdgetPlanForm.vue    | 22 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 4ae5ea2..e8e6663 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -431,6 +431,9 @@ import JSelectItem from '@/components/jeecgbiz/JSelectItem'
         id: r.tableId
       }).then((res) => {
         if (res.success) {
+          if (res.result.materialType==1){
+            this.isTargetLibrary=true;
+          }
           let formData = res.result
           formData.tableName = r.tableName
           this.data = formData
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index c56e99e..86b42a6 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -539,8 +539,8 @@
           materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
           needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
           processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
-          sort: { rules: [{ required: true, type: 'number', message: '请输入序号!'},
-                          { 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 个字符'}
                           // {validator: this.lengthCheck}
                         ]
           }
@@ -621,6 +621,7 @@
         immediate: true,
         handler: function(val) {
           this.planType = val
+          console.log("this.planType---",this.planType)
         }
       }
     },
@@ -645,12 +646,12 @@
       // this.form.setFieldsValue("materialGroup",123123);
     },
     methods: {
-      // lengthCheck(rule, value, callback){
-      //   if (value.toString().length >= 12 ){
-      //     // console.log("长度太长了");
-      //     callback("长度应当在0 ~ 12 字符")
-      //   }
-      // },
+      lengthCheck(rule, value, callback){
+        if (value.toString().length >= 12 ){
+          // console.log("长度太长了");
+          callback("长度应当在0 ~ 12 字符")
+        }
+      },
       selectRowChange(a, b, c) {
         // console.log("执行了",a,b,c);
       },
@@ -1114,7 +1115,9 @@
           id: r.tableId
         }).then((res) => {
           if (res.success) {
+            console.log("res.result.planType--",res.result.planType)
             this.$emit('planType',res.result.planType)
+            this.planType = res.result.planType
             let formData = res.result
             formData.tableName = r.tableName
             this.data = formData
@@ -1198,6 +1201,8 @@
               formData.procDefId = this.processData.id
               formData.procDeTitle = this.processData.name
               formData.title = this.processData.description
+              formData.planType=this.planType;
+              console.log("this.planType++",this.planType)
               if (!formData.tableName) formData.tableName = this.processData.businessTable
               var url = this.url.addFromTableApply
               let method = 'post'
@@ -1210,7 +1215,6 @@
                 formData.procDeTitle = this.processData.processName
                 formData.title = this.processData.title
                 formData.processInstanceId = this.processData.id
-                formData.planType=this.planType;
                 if (!this.assignees) {
                   this.$message.error('审批节点未分配候选审批人员，请联系管理员！')
                   return