From 46dd4fcb9c26ab1bc7c358c85f84c727322351dc Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 10 Nov 2022 16:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/PEditableTable.vue       |  8 +++++-
 .../activiti/form/ProcessUdgetPlanForm.vue    | 26 ++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/jeecg/PEditableTable.vue b/src/components/jeecg/PEditableTable.vue
index 4cbea60..a4fd7c7 100644
--- a/src/components/jeecg/PEditableTable.vue
+++ b/src/components/jeecg/PEditableTable.vue
@@ -11,7 +11,8 @@
       <a-col>
         <!-- 操作按钮 -->
         <div v-if="actionButton" class="action-button">
-          <a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-if="isabled" :disabled="disabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-else :disabled="!isabled">新增</a-button>
           <span class="gap"></span>
           <template v-if="selectedRowIds.length>0">
             <a-popconfirm
@@ -692,6 +693,11 @@
         type: Boolean,
         default: false
       },
+      // 是否禁用新增按钮
+      isabled: {
+        type: Boolean,
+        default: false
+      },
       // 是否可拖拽排序
       dragSort: {
         type: Boolean,
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 938d4af..e799d10 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -76,6 +76,7 @@
           :action-button="true"
           :rowNumber="true"
           :disabled="hieg"
+          :isabled = "isabled"
           :rowSelection="true"
           :actionButton="true"
           @descriptionFetch="descriptionFetchDatas"
@@ -164,6 +165,7 @@
     },
     data() {
       return {
+        isabled: true,
         bigId:[],
         opinion:"",
         bigIdRake:[],
@@ -231,6 +233,17 @@
               width: '200px',
               placeholder: '请输入${title}',
               options: [],
+              // // 表单验证规则
+              // validateRules: [
+              //   {
+              //     required: true, // 必填
+              //     message: '请输入${title}' // 提示的文本
+              //   },
+              //   {
+              //     pattern: /^[a-z|A-Z][a-z|A-Z\d_-]{0,}$/, // 正则
+              //     message: '${title}必须以字母开头，可包含数字、下划线、横杠'
+              //   }
+              // ]
             },
             // {
             //   title: '仓储地点_id',
@@ -297,7 +310,8 @@
               // dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+
             },
             {
               title: '系列',
@@ -601,6 +615,7 @@
         if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){
           if( record.row.id !== undefined && record.row.id !== '' && this.isBu !== record.row.materialGroup ){
             console.log("1出发了",record.row);
+            this.isabled = false;
             this.fetchMerchandiseNews(record.row.materialGroup);
             this.isBu = record.row.materialGroup;
             let values = [
@@ -684,6 +699,7 @@
               },
             ]
             this.$refs.processUdgetPlanMaterial.setValues(values);
+            this.isabled = true;
           }
 
         }
@@ -803,14 +819,6 @@
       // },
 
       descriptionFetchDatas(value){ //查询物料组
-
-
-
-
-
-
-
-
         //查询大品类数据
         let par = {
           delFlag: 0,