From dff5ae4de1933bafb15249ca9f05eba8fc3f69d9 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 13 Oct 2021 17:26:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         |  2 +-
 .../message/SysMessageTemplateList.vue        |  5 +--
 .../ConferenceMaintenance.vue                 |  2 +-
 .../InternationalSeminar.vue                  |  2 +-
 src/views/projectManagement/OtherMeeting.vue  |  2 +-
 .../modules/WorkGroupDistributeModule.vue     |  7 +++-
 src/views/system/PermissionList.vue           | 42 +++++++++----------
 src/views/system/SystemDept.vue               |  2 +-
 8 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index d158611..2d48d00 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -217,7 +217,7 @@ const columns = [
   {
     title: '项目',
     align: 'center',
-    dataIndex: 'chargeCompanyName'
+    dataIndex: 'projectName'
   },
   {
     title: '邮寄人',
diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index ce011ba..79f614d 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -7,7 +7,6 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
-
            <a-col :xl="6" :lg="8" :md="8" :sm="24">
              <a-form-item label="模板CODE">
                <a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input>
@@ -37,7 +36,7 @@
 
      <!-- 操作按钮区域 -->
      <div class="table-operator">
-       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>-->
      </div>
 
      <!-- table区域-begin -->
@@ -72,7 +71,7 @@
 
          <span slot="action" class="action-span-cell" slot-scope="text, record">
           <a @click="handleEdit(record)" v-has="'template:list'">编辑</a>
-          <a @click="handleDelete(record.id)">删除</a>
+<!--          <a @click="handleDelete(record.id)" v-has="'template:delete'">删除</a>-->
         </span>
 
        </a-table>
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index d066776..9f90b17 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -204,7 +204,7 @@ export default {
           dataIndex: 'startTime',
           width: 160,
           customRender: (text, record) => (
-            <j-ellipsis value={ record.startTime + record.endTime } length={ 20 }></j-ellipsis>)
+            <j-ellipsis value={ record.startTime + '~' + record.endTime } length={ 20 }></j-ellipsis>)
         },
         {
           title: '召开地点',
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index f3ccb26..22d6e26 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -171,7 +171,7 @@ export default {
           align: 'center',
           dataIndex: 'startTime',
           width: 160,
-          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
+          customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 59fadc5..a185e9b 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -168,7 +168,7 @@ name: 'OtherMeeting',
           align: 'center',
           dataIndex: 'startTime',
           width: 160,
-          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
+          customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' +  record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
diff --git a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
index d22e04d..ec46cb6 100644
--- a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
+++ b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
@@ -164,7 +164,12 @@ export default {
         this.confirmLoading = false
         return
       }
-      let str = this.checkedKeys.slice(1).join(',').toString()
+      let str = ''
+      if (this.checkedKeys[0] === '0-0') {
+        str = this.checkedKeys.slice(1).join(',').toString()
+      } else {
+        str = this.checkedKeys.join(',').toString()
+      }
       this.form.setFieldsValue({ memberName: str })
       this.form.validateFields((err) => {
         if (!err) {
diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue
index afc6102..d1d715e 100644
--- a/src/views/system/PermissionList.vue
+++ b/src/views/system/PermissionList.vue
@@ -39,28 +39,28 @@
         <span slot="action" slot-scope="text, record" class="action-span-cell">
           <a @click="handleEdit(record)">编辑</a>
 
-<!--          <a-dropdown>-->
-<!--            <a class="ant-dropdown-link">-->
-<!--              更多 <a-icon type="down"/>-->
-<!--            </a>-->
-<!--            <a-menu slot="overlay">-->
-<!--              <a-menu-item>-->
-<!--                <a href="javascript:;" @click="handleDetail(record)">详情</a>-->
-<!--              </a-menu-item>-->
-<!--              <a-menu-item>-->
-<!--                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>-->
-<!--              </a-menu-item>-->
-<!--              <a-menu-item>-->
-<!--                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>-->
-<!--              </a-menu-item>-->
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
+              </a-menu-item>
 
-<!--              <a-menu-item>-->
-<!--&lt;!&ndash;                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">&ndash;&gt;-->
-<!--                &lt;!&ndash;                </a-popconfirm>&ndash;&gt;-->
-<!--                <a @click="handleDelete(record.id)">删除</a>-->
-<!--              </a-menu-item>-->
-<!--            </a-menu>-->
-<!--          </a-dropdown>-->
+              <a-menu-item>
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+                <!--                </a-popconfirm>-->
+                <a @click="handleDelete(record.id)">删除</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
         </span>
           <!-- 字符串超长截取省略号显示 -->
           <span slot="url" slot-scope="text">
diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue
index c929bb8..5ee9a2b 100644
--- a/src/views/system/SystemDept.vue
+++ b/src/views/system/SystemDept.vue
@@ -51,7 +51,7 @@
           </div>
         </a-form-item>
         <a-form-item class="btn-form">
-          <a-button type="primary" class="btn-form-save" @click="handleOk">保存</a-button>
+          <a-button type="primary" class="btn-form-save" @click="handleOk" v-has="'system:dept:save'">保存</a-button>
           <a-button class="btn-form-cancel" @click="handleCancel">取消</a-button>
         </a-form-item>
       </a-form>