From 87564e9c81b4fb267caf240086c69bf800c6dbed Mon Sep 17 00:00:00 2001
From: "aoli.qu" <408346101@qq.com>
Date: Fri, 25 Feb 2022 11:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DbUeditor/index.vue   |  6 +--
 src/views/notice/NoticeList.vue      |  6 +++
 src/views/org/OrgForm.vue            | 55 +++++++++++++++++++++++++---
 src/views/security/menu/MenuForm.vue |  6 +--
 4 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/components/DbUeditor/index.vue b/src/components/DbUeditor/index.vue
index c753c07..de96576 100644
--- a/src/components/DbUeditor/index.vue
+++ b/src/components/DbUeditor/index.vue
@@ -20,9 +20,9 @@
           UEDITOR_HOME_URL: '/static/plugins/ueditor/',
           // serverUrl: '//ueditor.szcloudplus.com/cos'
           serverUrl: process.env.VUE_APP_API_BASE_URL +  '/sys/ueditor/config',
-          headers: {
-            Authorization: storage.get(ACCESS_TOKEN)
-          }
+          // headers: {
+          //   Authorization: storage.get(ACCESS_TOKEN)
+          // }
         },
       }
     },
diff --git a/src/views/notice/NoticeList.vue b/src/views/notice/NoticeList.vue
index d43af1a..8e07daa 100644
--- a/src/views/notice/NoticeList.vue
+++ b/src/views/notice/NoticeList.vue
@@ -153,6 +153,12 @@
             title: '公告类型',
             dataIndex: 'type',
             scopedSlots: { customRender: 'type' }
+          },
+          {
+            title: '操作',
+            width: 200,
+            dataIndex: 'action',
+            scopedSlots: { customRender: 'action' }
           }
         ],
         // 加载数据方法 必须为 Promise 对象
diff --git a/src/views/org/OrgForm.vue b/src/views/org/OrgForm.vue
index b9de120..16a847d 100644
--- a/src/views/org/OrgForm.vue
+++ b/src/views/org/OrgForm.vue
@@ -6,6 +6,7 @@
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
     @cancel="handleCancel"
+    :destroyOnClose="true"
   >
     <a-spin :spinning="formLoading">
       <a-form :form="form">
@@ -62,11 +63,35 @@
           label="类型"
         >
           <a-radio-group v-decorator="['type',{rules: [{ required: true, message: '请选择类型！' }]}]" >
-            <a-radio :value="1" :checked="true">{{ orgType === 1 ? '单位' : '项目' }}</a-radio>
-            <a-radio :value="2">部门</a-radio>
+            <a-radio @click="typeFunc(1)" :value="1" :checked="true">{{ orgType === 1 ? '单位' : '项目' }}</a-radio>
+            <a-radio @click="typeFunc(2)" :value="2">部门</a-radio>
           </a-radio-group>
         </a-form-item>
 
+        <div v-show="companyDiv">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="企业信息"
+          >
+            <a-textarea :rows="4" placeholder="请输入企业信息" v-decorator="['companyInfo']"></a-textarea>
+          </a-form-item>
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="社会信用代码"
+          >
+            <a-input v-decorator="['socialCreditCode']" />
+          </a-form-item>
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="邀请码"
+          >
+            <a-input disabled v-decorator="['invitationCode']" />
+          </a-form-item>
+        </div>
+
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -118,7 +143,8 @@
           value: 'id'
         },
         form: this.$form.createForm(this),
-        orgType: 1
+        orgType: 1,
+        companyDiv: false
       }
     },
     methods: {
@@ -127,6 +153,11 @@
         this.visible = true
         this.modalTitle = '新增'
         this.orgType = orgType
+				if (this.orgType == 1 ) {
+          this.companyDiv = true
+        } else {
+          this.companyDiv = false
+        }
         this.getOrgTree()
       },
       // 编辑初始化方法
@@ -134,6 +165,11 @@
         this.visible = true
         this.modalTitle = '编辑'
         this.orgType = record.orgType
+				if (this.orgType == 1 && record.type == 1){
+          this.companyDiv = true
+        } else {
+          this.companyDiv = false
+        }
         this.getOrgTree()
         setTimeout(() => {
           this.form.setFieldsValue(
@@ -144,7 +180,10 @@
               type: record.type,
               sort: record.sort,
               pid: record.pid,
-              remark: record.remark
+              remark: record.remark,
+              companyInfo: record.companyInfo,
+              socialCreditCode: record.socialCreditCode,
+              invitationCode: record.invitationCode
             }
           )
         }, 100)
@@ -177,7 +216,13 @@
           }]
         })
       },
-
+      typeFunc (type) {
+        if (this.orgType === 1 && type === 1) {
+          this.companyDiv = true
+        } else {
+          this.companyDiv = false
+        }
+      },
       handleSubmit () {
         const { form: { validateFields } } = this
         this.confirmLoading = true
diff --git a/src/views/security/menu/MenuForm.vue b/src/views/security/menu/MenuForm.vue
index 6f170cd..0552638 100644
--- a/src/views/security/menu/MenuForm.vue
+++ b/src/views/security/menu/MenuForm.vue
@@ -183,11 +183,11 @@ export default {
       this.meneTypeFunc(record.type.toString())
 
       // 默认选中的单选框
-      const visibleDef = false
+      let visibleDef = false
       if (record.visible == 1) {
-        this.visibleDef = true
+        visibleDef = true
       }
-      this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: this.visibleDef })
+      this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: visibleDef })
       this.treeSelDefaultValue = record.pid
 
       setTimeout(() => {