Jelajahi Sumber

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
修改

1004749546@qq.com 4 tahun lalu
induk
melakukan
94ad5041b1

+ 2 - 15
src/views/evaluation/evaluationItem/AddEvaIndexModal.vue

@@ -23,7 +23,7 @@
           <a-button :loading="loading" id="addEvaIndexModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaIndexModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaIndexModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -129,20 +129,7 @@ export default {
         }
       })
     },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
-    },
+
     clear () {
       this.form.resetFields()
     }

+ 1 - 18
src/views/evaluation/evaluationItem/AddEvaItemModal.vue

@@ -41,7 +41,7 @@
           <a-button :loading="loading" id="addEvaItemModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaItemModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaItemModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -155,24 +155,7 @@ export default {
           })
         }
       })
-    },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.cancel()
-        }
-      })
-    },
-    clear () {
-      this.form.resetFields()
     }
-
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, {

+ 9 - 7
src/views/evaluation/evaluationItem/EvaluationItem.vue

@@ -28,7 +28,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button id="evaluationItem-add" type="primary" icon="plus" @click="openModal">新增</a-button>
+      <a-button v-hasPermission="'B_evaluationItem_add'" id="evaluationItem-add" type="primary" icon="plus" @click="openModal">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -39,14 +39,16 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon id="evaluationItem-edit" type="edit" class="actionBtn blue" v-if="record.status == '0'" @click="openModal(record)" />
-        <a-icon id="evaluationItem-delete" type="delete" class="actionBtn red" v-if="record.status == '0'" @click="delect(record)" />
-        <a-icon id="evaluationItem-setting" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+        <a-icon id="evaluationItem-edit" type="edit" class="actionBtn blue" v-if="record.status == '0'&& $hasPermissions('B_evaluation_edit')" @click="openModal(record)" />
+        <a-icon id="evaluationItem-delete" type="delete" class="actionBtn red" v-if="record.status == '0'&& $hasPermissions('B_evaluationItem_del')" @click="delect(record)" />
+        <a-icon v-hasPermission="'M_evaluationItem_set'" id="evaluationItem-setting" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+		<div v-if="!$hasPermissions('B_evaluation_edit') && !$hasPermissions('B_evaluationItem_del') && !$hasPermissions('M_evaluationItem_set')">-</div>
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
-        <a-switch id="evaluationItem-enableStatus" checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)"/>
-      </template>
+        <a-switch v-if="$hasPermissions('B_evaluationItem_enable')" id="evaluationItem-enableStatus" checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)"/>
+		<span v-else :class="[text==1 ? 'green' : 'red']">{{ text==1 ? '已启用' : '已禁用' }}</span>
+	  </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
     <add-evaItemModal :itemId="itemId" :visible="openAddModal" @refresh="reset" @close="openAddModal=false"></add-evaItemModal>
@@ -209,7 +211,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 	.table-page-search-wrapper,
 	.addButton {
 		margin-bottom: 0;

+ 4 - 3
src/views/evaluation/evaluationItem/SetEvaItemModal.vue

@@ -3,7 +3,7 @@
     <a-modal class="modalBox" title="设置考评指标" v-model="isshow" @cancle="cancel" :width="'60%'">
       <a-row :gutter="24" class="header">
         <span>请给考评项目为【{{ itemName }}】设置考评指标</span>
-        <a-button id="setEvaItemModal-add" type="primary" @click="openModal">新增</a-button>
+        <a-button v-hasPermission="'B_target_add'" id="setEvaItemModal-add" type="primary" @click="openModal">新增</a-button>
       </a-row>
       <a-table
         ref="table"
@@ -15,8 +15,9 @@
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-icon id="setEvaItemModal-edit" type="edit" class="actionBtn blue" @click="openModal(record)" />
-          <a-icon id="setEvaItemModal-delete" type="delete" class="actionBtn red" @click="delect(record)" />
+          <a-icon v-hasPermission="'B_target_edit'" id="setEvaItemModal-edit" type="edit" class="actionBtn blue" @click="openModal(record)" />
+          <a-icon v-hasPermission="'assess_target_delete'" id="setEvaItemModal-delete" type="delete" class="actionBtn red" @click="delect(record)" />
+          <span v-if="!$hasPermissions('B_target_edit') && !$hasPermissions('assess_target_delete')">-</span>
         </template>
       </a-table>
       <!-- 新增/编辑 弹窗 -->

+ 1 - 1
src/views/evaluation/evaluationPlan/AddEvaModal.vue

@@ -61,7 +61,7 @@
           <a-button :loading="loading" id="addEvaModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>

+ 14 - 6
src/views/evaluation/evaluationPlan/EvaluationPlan.vue

@@ -28,8 +28,8 @@
     </div>
     <a-divider />
     <a-row class="add-btn" type="flex" justify="space-between">
-      <a-button id="evaluationPlan-add" type="primary" icon="plus" @click="openModal">新增</a-button>
-      <a-col id="evaluationPlan-setDefaultPlan" @click="handleDefaultSet">
+      <a-button v-hasPermission="'B_evaluationPlan_add'" id="evaluationPlan-add" type="primary" icon="plus" @click="openModal">新增</a-button>
+      <a-col v-hasPermission="'M_evaluationPlan_default'" id="evaluationPlan-setDefaultPlan" @click="handleDefaultSet">
         <a-icon type="setting" class="setting-icon" />
         <span class="setting">默认方案设置</span>
       </a-col>
@@ -43,13 +43,21 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon id="evaluationPlan-edit" type="edit" class="actionBtn blue" v-if="record.status == '0'" @click="openModal(record)" />
-        <a-icon id="evaluationPlan-delete" type="delete" class="actionBtn red" v-if="record.status == '0'" @click="delect(record)" />
-        <a-icon id="evaluationPlan-setting" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+        <a-icon id="evaluationPlan-edit" type="edit" class="actionBtn blue" v-if="record.status == '0' && $hasPermissions('M_evaluationPlan_edit')" @click="openModal(record)" />
+        <a-icon id="evaluationPlan-delete" type="delete" class="actionBtn red" v-if="record.status == '0' && $hasPermissions('B_evaluationPlan_del')" @click="delect(record)" />
+        <a-icon v-hasPermission="'M_evaluationPlan_setItem'" id="evaluationPlan-setting" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+        <span v-if="!$hasPermissions('M_evaluationPlan_edit') && !$hasPermissions('B_evaluationPlan_del') && !$hasPermissions('M_evaluationPlan_setItem')">-</span>
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
-        <a-switch id="evaluationPlan-enableStatus" checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)" />
+        <a-switch
+          v-if="$hasPermissions('B_evaluationPlan_enable')"
+          id="evaluationPlan-enableStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          v-model="row.status"
+          @change="changeFlagHandle(row)" />
+        <span v-else :class="[text==1 ? 'green' : 'red']">{{ text==1 ? '已启用' : '已禁用' }}</span>
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->

+ 1 - 1
src/views/evaluation/evaluationPlan/SetEvaDefaultModal.vue

@@ -52,7 +52,7 @@
           <a-button :loading="loading" id="setEvaDefaultModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="setEvaDefaultModal-cancle" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="setEvaDefaultModal-cancle" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>

+ 0 - 3
src/views/evaluation/evaluationPlan/SetEvaModal.vue

@@ -201,9 +201,6 @@ export default {
       loadItemData: parameter => {
         return getItemList().then(res => {
           if (res.status == 200) {
-            //       res.data.map((item, index) => {
-			   // res.data.no = index + 1
-            //       })
             return res.data
           }
         })