Skip to content

S
saas-manage
Commit 4522add0 by qinjianhui
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !16
parents 57e95073 0cfb3c3b
Showing with 24 additions and 45 deletions
README.md
...@@ -18,7 +18,7 @@ npm run build ...@@ -18,7 +18,7 @@ npm run build
### Lints and fixes files ### Lints and fixes files
``` ```
npm run lint npm run lint
``` ````
### Customize configuration ### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/). See [Configuration Reference](https://cli.vuejs.org/config/).
src/views/system/users.vue
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<el-input <el-input
style="width: 164px" style="width: 164px"
v-model="addcurrencyform.realName" v-model="addcurrencyform.realName"
placeholder="请输入登录账号" placeholder="请输入姓名"
maxlength="30" maxlength="30"
></el-input> ></el-input>
</el-form-item> </el-form-item>
......
src/views/taskManage/index.vue
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<span>已归档</span> <span>已归档</span>
</div> </div>
</div> </div>
<div class="content"> <div class="content" v-loading="detailLoading">
<div class="detail_list"> <div class="detail_list">
<div class="item_wrap"> <div class="item_wrap">
<p class="item" style="width: 100%"> <p class="item" style="width: 100%">
...@@ -402,6 +402,7 @@ export default { ...@@ -402,6 +402,7 @@ export default {
return { return {
loading: false, loading: false,
detailLoading: false,
user: '', user: '',
textarea: '', textarea: '',
centerPageOptions: { centerPageOptions: {
...@@ -415,7 +416,7 @@ export default { ...@@ -415,7 +416,7 @@ export default {
selections: [], selections: [],
is_tab: '1', is_tab: '1',
statusCode: 'PRE_HANDLING', statusCode: 'PRE_HANDLING',
searchForm: { timeProp: 'create_time' }, searchForm: { timeProp: 'create_time', sign: 1 },
isEdit: false, isEdit: false,
sourceData: [], sourceData: [],
currentRowId: '', currentRowId: '',
...@@ -452,16 +453,12 @@ export default { ...@@ -452,16 +453,12 @@ export default {
minWidth: 120, minWidth: 120,
align: 'left', align: 'left',
render: (item) => ( render: (item) => (
<span> <span style="position: relative;">
<span <span>{item.title}</span>
class={ {item.sign === 1 &&
item.sign === 0 item.orderStatus === 'PRE_HANDLING' && (
? 'set-blue' <i class="el-icon-info" title="待回复"></i>
: 'order-title' )}
}
>
{item.title}
</span>
</span> </span>
), ),
}, },
...@@ -573,13 +570,6 @@ export default { ...@@ -573,13 +570,6 @@ export default {
) { ) {
return 'order-green' return 'order-green'
} }
if (
row.orderStatus === 'PRE_HANDLING' &&
columnIndex === 4 &&
!row.sign
) {
return 'order-orange'
}
if (columnIndex === 4) { if (columnIndex === 4) {
return 'order-grey' return 'order-grey'
} }
...@@ -743,6 +733,7 @@ export default { ...@@ -743,6 +733,7 @@ export default {
} }
try { try {
this.detailLoading = true
const res = await replyTocustomer( const res = await replyTocustomer(
this.currentRowId, this.currentRowId,
this.textarea, this.textarea,
...@@ -752,11 +743,14 @@ export default { ...@@ -752,11 +743,14 @@ export default {
} }
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} finally {
this.detailLoading = false
} }
}, },
async showDetail(item) { async showDetail(item) {
this.currentRowId = item.id this.currentRowId = item.id
this.detail = item this.detail = item
this.detailLoading = true
axios axios
.get( .get(
`platform/platformWorkOrderChat/getByWorkOrder?workOrderId=${item.id}`, `platform/platformWorkOrderChat/getByWorkOrder?workOrderId=${item.id}`,
...@@ -765,6 +759,7 @@ export default { ...@@ -765,6 +759,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.chatRecord = res.data this.chatRecord = res.data
} }
this.detailLoading = false
}) })
this.detailVisible = true this.detailVisible = true
this.textarea = '' this.textarea = ''
...@@ -780,22 +775,22 @@ export default { ...@@ -780,22 +775,22 @@ export default {
&::v-deep { &::v-deep {
.order-blue { .order-blue {
background-color: #409EFF !important; background-color: #409eff !important;
color: #fff; color: #fff;
} }
.order-red { .order-red {
background-color: #F56C6C !important; background-color: #f56c6c !important;
color: #fff; color: #fff;
} }
.order-green { .order-green {
background-color: #67C23A !important; background-color: #67c23a !important;
color: #fff; color: #fff;
} }
.order-orange { .order-orange {
background-color: #E6A23C !important; background-color: #e6a23c !important;
color: #fff; color: #fff;
} }
...@@ -803,29 +798,13 @@ export default { ...@@ -803,29 +798,13 @@ export default {
background-color: #909399 !important; background-color: #909399 !important;
color: #fff; color: #fff;
} }
.set-blue { .el-icon-info::before {
margin-left: 20px;
}
.el-table tr {
position: relative;
}
.set-blue::after {
position: absolute; position: absolute;
content: ''; right: -13px;
display: inline-block;
width: 8px;
height: 8px;
background-color: green;
border-radius: 50%;
left: 6px;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} color: #f56c6c;
cursor: pointer;
.order-title {
margin-left: 20px;
} }
.el-tree-node { .el-tree-node {
font-size: 14px; font-size: 14px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment