Prechádzať zdrojové kódy

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

1004749546@qq.com 4 rokov pred
rodič
commit
903747dee9

+ 33 - 15
src/views/evaluation/evaluationItem/EvaluationItem.vue

@@ -39,17 +39,29 @@
       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-setting" title="设置考评指标" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+        <a-icon
+          id="evaluationItem-edit"
+          type="edit"
+          title="编辑"
+          class="actionBtn blue"
+          v-if="record.status == '0'"
+          @click="openModal(record)" />
+        <a-icon
+          id="evaluationItem-delete"
+          title="删除"
+          type="delete"
+          class="actionBtn red"
+          v-if="record.status == '0'"
+          @click="delect(record)" />
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
-        <a-switch id="evaluationItem-enableStatus" checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)"/>
+        <a-switch id="evaluationItem-enableStatus" checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)" />
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
-    <add-evaItemModal :itemId="itemId" :visible="openAddModal" @refresh="$refs.table.refresh()" @close="openAddModal=false"></add-evaItemModal>
+    <add-evaItemModal :itemId="itemId" :visible="openAddModal" @refresh="reset" @close="openAddModal=false"></add-evaItemModal>
     <!-- 设置弹窗 -->
     <set-evaItemModal :itemId="itemId" :itemName="itemName" :visible="openSetting" @close="openSetting=false"></set-evaItemModal>
   </a-card>
@@ -83,7 +95,7 @@ export default {
       pageNo: 1,
       pageSize: 10,
       openAddModal: false, // 打开新增弹窗
-	  openSetting: false, // 打开设置弹窗
+      openSetting: false, // 打开设置弹窗
       itemId: '', // 要编辑的考评项id
       itemName: '', // 要编辑的考评项名称
       // 查询参数
@@ -108,7 +120,10 @@ export default {
         title: '考评项目说明',
         dataIndex: 'desc',
         width: 300,
-        align: 'center'
+        align: 'center',
+        customRender: (text) => {
+		  return text || '--'
+        }
       },
       {
         title: '状态',
@@ -153,7 +168,7 @@ export default {
   methods: {
     // 修改状态
     changeFlagHandle (record) {
-      console.log(record, '222222222')
+      // console.log(record, '222222222')
       const _data = {
         id: record.id,
         status: record.status ? '1' : '0'
@@ -183,12 +198,12 @@ export default {
         cancelText: '取消',
         onOk () {
           itemDelete({
-          	id: row.id
+            id: row.id
           }).then(res => {
-          	if (res.status == 200) {
-          		_this.$message.success(res.message)
-          		_this.$refs.table.refresh()
-          	}
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
           })
         }
       })
@@ -196,8 +211,8 @@ export default {
     // 打开设置弹框
     handleSet (row) {
       this.openSetting = true
-	  this.itemId = row.id
-	  this.itemName = row.name
+      this.itemId = row.id
+      this.itemName = row.name
     },
     // 重置
     reset () {
@@ -219,9 +234,11 @@ export default {
 	.table-page-search-wrapper .ant-form-inline .ant-form-item {
 		margin-bottom: 10px;
 	}
+
 	.table-operator {
 		margin-bottom: 10px;
 	}
+
 	.textCount {
 		border: 1px solid #91d5ff;
 		background-color: #e6f7ff;
@@ -261,6 +278,7 @@ export default {
 	.red {
 		color: red;
 	}
+
 	.orange {
 		color: #ffaa00;
 	}

+ 2 - 2
src/views/evaluation/evaluationItem/SetEvaItemModal.vue

@@ -21,8 +21,8 @@
         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 id="setEvaItemModal-edit" title="编辑" type="edit" class="actionBtn blue" @click="openModal(record)" />
+          <a-icon id="setEvaItemModal-delete" title="删除" type="delete" class="actionBtn red" @click="delect(record)" />
         </template>
       </a-table>
       <!-- 新增/编辑 弹窗 -->

+ 8 - 5
src/views/evaluation/evaluationPlan/EvaluationPlan.vue

@@ -44,9 +44,9 @@
       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-setting" title="选择考评项目" type="setting" class="actionBtn orange" @click="handleSet(record)" />
+        <a-icon id="evaluationPlan-edit" title="编辑" type="edit" class="actionBtn blue" v-if="record.status == '0'" @click="openModal(record)" />
+        <a-icon id="evaluationPlan-delete" title="删除" type="delete" class="actionBtn red" v-if="record.status == '0'" @click="delect(record)" />
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
@@ -54,7 +54,7 @@
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
-    <add-evaModal :itemId="itemId" :visible="openAddModal" @refresh="$refs.table.refresh()" @close="openAddModal=false"></add-evaModal>
+    <add-evaModal :itemId="itemId" :visible="openAddModal" @refresh="reset" @close="openAddModal=false"></add-evaModal>
     <!-- 选择考评项弹窗 -->
     <set-evaModal :itemId="itemId" :itemName="itemName" :visible="openSetting" @close="openSetting=false"></set-evaModal>
     <!-- 设置默认方案弹窗 -->
@@ -118,7 +118,10 @@ export default {
         title: '考评方案说明',
         dataIndex: 'desc',
         width: 300,
-        align: 'center'
+        align: 'center',
+		customRender: (text) => {
+		  return text || '--'
+		}
       },
       {
         title: '适用模式',

+ 6 - 3
src/views/tenants/tenantsList.vue

@@ -38,8 +38,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" class="actionBtn blue" @click="openModal(record)" />
-        <!-- <a-icon type="delete" class="actionBtn red" v-if="record.status == '0'" @click="delect(record)" /> -->
+        <a-icon title="编辑" type="edit" class="actionBtn blue" @click="openModal(record)" />
+        <!-- <a-icon title="删除" type="delete" class="actionBtn red" v-if="record.status == '0'" @click="delect(record)" /> -->
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
@@ -105,7 +105,10 @@ export default {
         title: '负责人名称',
         dataIndex: 'contactName',
         width: '120',
-        align: 'center'
+        align: 'center',
+        customRender: (text) => {
+		  return text || '--'
+        }
       },
       {
         title: '负责人手机',