From b012014fa1184f7fe835b8061107cc28a3f24e95 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 29 Jul 2022 17:21:31 +0800
Subject: [PATCH] 11

---
 src/assets/img/file-add.png                     | Bin 0 -> 15610 bytes
 .../event/cpts/process-form-project.vue         |   6 +++++-
 src/views/modules/workSys/role/role.vue         |   5 ++---
 src/views/modules/workSys/role/roleForm.vue     |   7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/img/file-add.png

diff --git a/src/assets/img/file-add.png b/src/assets/img/file-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..77435e3e402fdf5096a5b1e23f5eb1226d0c0a5c
GIT binary patch
literal 15610
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
S(Fm<Po$Pef*q^U#+4En!GDd9x

literal 0
HcmV?d00001

diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 16a8fee6..3be3b4a8 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -131,7 +131,11 @@
                    :on-success="handleImgSuccess"
                    :on-remove="handleImgRemove"
                    :before-upload="beforeImgUpload">
-          <i :class="['el-icon-plus', source==='manage'?'avatar-uploader-icon':'avatar-uploader-icon2']"></i>
+          <i v-if="source==='manage'"
+             :class="['el-icon-plus']"></i>
+          <img v-else
+               style="width:27px;height:27px"
+               src="@/assets/img/file-add.png">
         </el-upload>
       </el-form-item>
 
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index 13a5aba1..4168a3e8 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -95,8 +95,7 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.defaultRole!=='1'"
-                       type="text"
+            <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -262,7 +261,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_form.initForm('edit', row.id, row.defaultRole)
       })
     },
     handleDetail (row) {
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 0e0304a2..8b21186d 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -14,6 +14,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
+                    :disabled="defaultRole==='1'"
                     placeholder="请输入角色名称"
                     clearable
                     v-model="formData.name">
@@ -27,6 +28,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
+                    :disabled="defaultRole==='1'"
                     maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 5, maxRows: 10 }"
@@ -104,7 +106,7 @@ export default {
         customerId: ''
       },
 
-
+      defaultRole: '',
 
     }
   },
@@ -116,7 +118,7 @@ export default {
 
   methods: {
 
-    async initForm (type, roleId) {
+    async initForm (type, roleId, defaultRole) {
       this.startLoading()
       this.customerId = localStorage.getItem("customerId");
       this.formData.customerId = this.customerId
@@ -132,6 +134,7 @@ export default {
       if (roleId) {
         this.roleId = roleId
         this.formData.id = roleId
+        this.defaultRole = defaultRole
         this.loadFormData()
       }