From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/problems.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/problems.vue b/admin/src/views/business/problems.vue
index b701349..2389c84 100644
--- a/admin/src/views/business/problems.vue
+++ b/admin/src/views/business/problems.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:company:query']">
+ <TableLayout :permissions="['business:problems:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="棰樼洰鍚嶇О" prop="title">
@@ -7,8 +7,9 @@
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="useType">
<el-select v-model="searchForm.useType" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="鍔冲姟浜哄憳" value="0"></el-option>
- <el-option label="鏅�氳瀹�" value="1"></el-option>
+ <el-option label="璁垮鍜屽姵鍔�" value="0"></el-option>
+ <el-option label="浠呰瀹�" value="1"></el-option>
+ <el-option label="浠呭姵鍔�" value="2"></el-option>
</el-select>
</el-form-item>
<section>
@@ -18,30 +19,33 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:company:create']">
- <li><el-button type="primary" @click="$refs.operaProblemsWindow.open('鏂板缓璇曢淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:company:create']">鏂板缓</el-button></li>
+ <ul class="toolbar" v-permissions="['business:problems:create']">
+ <li><el-button type="primary" @click="$refs.operaProblemsWindow.open('鏂板缓璇曢淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:problems:create']">鏂板缓</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
>
- <el-table-column prop="title" label="棰樼洰鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="title" label="棰樼洰鍚嶇О" min-width="150px"></el-table-column>
<el-table-column prop="useType" label="閫傜敤浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.useType === 0">鍔冲姟浜哄憳</span>
- <span v-if="row.useType === 1">鏅�氳瀹�</span>
+ <span v-if="row.useType === 0">璁垮鍜屽姵鍔�</span>
+ <span v-if="row.useType === 1">浠呰瀹�</span>
+ <span v-if="row.useType === 2">浠呭姵鍔�</span>
</template>
</el-table-column>
<el-table-column prop="type" label="棰樼洰绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.useType === 0">鍗曢��</span>
- <span v-if="row.useType === 1">澶氶��</span>
+ <span v-if="row.type === 0">鍒ゆ柇</span>
+ <span v-if="row.type === 1">鍗曢��</span>
+ <span v-if="row.type === 2">澶氶��</span>
</template>
</el-table-column>
+ <el-table-column prop="score" label="鍒嗗��" min-width="100px"></el-table-column>
<el-table-column prop="sortnu" label="棰樼洰椤哄簭(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="creatorName" label="鍒涘缓浜�" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:company:update', 'business:company:delete'])"
label="鎿嶄綔"
@@ -49,7 +53,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaProblemsWindow.open('缂栬緫璇曢淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+ <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -92,6 +96,26 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ edit (row) {
+ if (row.objectList && row.objectList.length > 0) {
+ row.objectList = row.objectList.map((item, index) => {
+ return {
+ code: item.code,
+ value: item.value,
+ sort: '閫夐」' + item.code,
+ id: index.toString()
+ }
+ })
+ } else {
+ row.objectList = []
+ }
+ if (row.type === 2) {
+ row.answer = row.answer.split(',')
+ }
+ this.$refs.operaProblemsWindow.open('缂栬緫璇曢淇℃伅', row)
+ }
}
}
</script>
--
Gitblit v1.9.3