bug修复

src/components/selectWorkshop/search.vue

@@ -98,8 +98,11 @@
       }
     },
     watch: {
-      options_groupId(nval) {
-        this.toTreeData(nval);
+      options_groupId: {
+        immediate: true,
+        handler(val) {
+          this.toTreeData(val);
+        }
       }
     },
     data() {
@@ -159,6 +162,7 @@
           idField: 'id',
           parentIdField: 'parentId'
         });
+        console.log('this.options.groupId', this.options.groupId);
       }
     }
   };

src/components/selectWorkshop/selectWorkshop.vue

@@ -21,6 +21,10 @@
         :datasource="datasource"
         :selection.sync="selection"
       >
+        <template v-slot:groupId="{ row }">
+          {{ showgroupName(row.groupId) }}
+        </template>
+
         <!-- 单选列 -->
         <template v-slot:radio="{ row }">
           <el-radio
@@ -190,7 +194,7 @@
       // 获取公司数据
       getGs() {
         listOrganizations().then((list) => {
-          console.log(list);
+          console.log('公司', list);
           this.dictObj.groupId = list;
         });
       },
@@ -203,6 +207,15 @@
         getFactoryarea(par).then((res) => {
           this.dictObj.factory = res.list;
         });
+      },
+      // 回显公司名称
+      showgroupName(id) {
+        let result = this.dictObj.groupId.find((n) => n.id == id);
+        if (result) {
+          return result.name;
+        } else {
+          return '';
+        }
       }
     }
   };

src/views/rulesManagement/recordPlan/components/programRulesDialog.vue

@@ -1306,8 +1306,7 @@
           return {
             userId: user.id,
             userName: user.name,
-            teamId: user.teamId,
-            teamName: user.teamName,
+
             groupId: user.groupId,
             groupName: user.groupName
           };

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -25,7 +25,6 @@
               v-model="formData.industryType"
               dictName="行业类别"
               placeholder="请选择行业类别"
-              isProhibit
             />
           </el-form-item>
         </el-col>
@@ -35,7 +34,6 @@
               v-model="formData.businessType"
               dictName="业务类型"
               placeholder="请选择业务分类"
-              isProhibit
             />
           </el-form-item>
         </el-col>
@@ -45,7 +43,6 @@
               v-model="formData.reportWorkType"
               dictName="记录规则报工类型"
               placeholder="请选择模块划分"
-              isProhibit
             />
           </el-form-item>
         </el-col>
@@ -55,7 +52,6 @@
               v-model="formData.classify"
               dictName="记录规则类型"
               placeholder="请选择应用场景"
-              isProhibit
             />
           </el-form-item>
         </el-col>
@@ -65,7 +61,6 @@
               v-model="formData.recordTemplateStyle"
               dictName="记录表模板样式"
               placeholder="请选择模板样式"
-              isProhibit
             />
           </el-form-item>
         </el-col>
@@ -499,7 +494,6 @@
           </el-link>
         </template>
       </ele-pro-table>
-
     </el-form>
     <template v-slot:footer>
       <el-button