Browse Source

优化

master
陈裕财 4 years ago
parent
commit
6c5e2928ef
  1. 54
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  2. 50
      src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue

54
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -8,8 +8,8 @@
<el-divider direction="vertical"></el-divider>
<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" icon="el-icon-search" @click="flowInfoVisible=true">日志</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" icon="el-icon-copy" @click="copyLink=true">拷贝链接</el-button>
</el-form-item>
<el-row>
<el-col :span="8">
@ -60,7 +60,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime" @change="editXmQuestionSomeFields(editForm,'endTime',$event)"></el-date-picker>
<el-date-picker style="max-width:100%;" value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.endTime" @change="editXmQuestionSomeFields(editForm,'endTime',$event)"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@ -178,22 +178,30 @@
</el-tab-pane>
<el-tab-pane label="处理意见" name="4">
<el-form-item prop="remarks" label-width="0px">
<el-tooltip content="点击切换为富文本编辑|普通文本">
<el-button icon="el-icon-refresh" @click="receiptMessageEditorVisible=!receiptMessageEditorVisible" type="text"></el-button>
</el-tooltip>
<div v-if="receiptMessageEditorVisible==false">
<el-input style="width:100%;" v-model="editForm.remarks" type="textarea" :rows="6"> </el-input>
</div>
<div v-else>
<vue-editor :id="'receiptMessage_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.remarks"></vue-editor>
<el-row>
<el-col :span="16">
<el-form-item prop="remarks" label-width="0px">
<el-button icon="el-icon-refresh" @click="receiptMessageEditorVisible=!receiptMessageEditorVisible" type="text">点击切换为富文本编辑|普通文本</el-button>
<el-button @click="flowInfoVisible=!flowInfoVisible" type="text">流转历史</el-button>
</div>
</el-form-item>
<el-row class="page-bottom">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-if="editForm.remarks!=editFormBak.remarks" v-loading="load.edit" type="primary" @click.native="editXmQuestionSomeFields(editForm,'remarks',editForm.remarks)" :disabled="load.edit==true">保存</el-button>
<div v-if="receiptMessageEditorVisible==false">
<el-input style="width:100%;" v-model="editForm.remarks" type="textarea" :rows="6"> </el-input>
</div>
<div v-else>
<vue-editor style="max-width:100%;" :id="'receiptMessage_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.remarks"></vue-editor>
</div>
</el-form-item>
<el-row class="page-bottom">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-if="editForm.remarks!=editFormBak.remarks" v-loading="load.edit" type="primary" @click.native="editXmQuestionSomeFields(editForm,'remarks',editForm.remarks)" :disabled="load.edit==true">保存</el-button>
</el-row>
</el-col>
<el-col :span="8">
<xm-question-handle-mng class="padding-left" v-if="activateTabPaneName=='4' && flowInfoVisible==true" :bug="editForm" :visible="flowInfoVisible"></xm-question-handle-mng>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="关注" name="91">
@ -214,15 +222,7 @@
<el-drawer append-to-body title="需求选择" :visible.sync="selectMenuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select :is-select-menu="true" checkScope="3" @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
</el-drawer>
</el-row>
<!--新增 XmQuestion xm_question界面-->
<el-drawer title="流转日志" :visible.sync="flowInfoVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-question-handle-mng :bug="editForm" :visible="flowInfoVisible"></xm-question-handle-mng>
</el-drawer>
</el-row>
<el-drawer append-to-body title="标签" :visible.sync="tagSelectVisible" class="dialog-body" size="60%">
<tag-mng :tagIds="editForm.tagIds?editForm.tagIds.split(','):[]" :jump="true" @select-confirm="onTagSelected">
</tag-mng>

50
src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue

@ -1,34 +1,20 @@
<template>
<section class="page-container padding border">
<el-row class="page-main">
<section>
<el-row>
<!--列表 XmQuestionHandle xm_question_handle-->
<el-table ref="table" :height="tableHeight" :data="xmQuestionHandles" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column sortable type="index" width="60"></el-table-column>
<el-table-column prop="handlerUsername" label="指派" min-width="80" >
<template slot-scope="scope">
<div v-if="scope.row.targetUserid==scope.row.handlerUserid">
{{scope.row.handlerUsername}}&nbsp;&nbsp;提交\保存
</div>
<div v-if="scope.row.targetUserid!=scope.row.handlerUserid">
{{scope.row.handlerUsername}}&nbsp;&nbsp;指派给&nbsp;&nbsp;{{scope.row.targetUsername}}
</div>
</template>
</el-table-column>
<el-table-column prop="receiptMessage" label="处理意见" min-width="80" ></el-table-column>
<el-table-column prop="receiptTime" label="时间" min-width="80" ></el-table-column>
<el-table-column prop="handleStatus" label="状态" min-width="80" >
<el-table-column prop="handleStatus" label="bug状态" width="100" >
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.handleStatus=='create' ">创建</el-tag>
<el-tag type="primary" v-else-if="scope.row.handleStatus=='active'">已激活</el-tag>
<el-tag type="warning" v-else-if="scope.row.handleStatus=='confirm'">确认</el-tag>
<el-tag type="warning" v-else-if="scope.row.handleStatus=='confirmed'">已确认</el-tag>
<el-tag type="success" v-else-if="scope.row.handleStatus=='solve'">解决</el-tag>
<el-tag type="success" v-else-if="scope.row.handleStatus=='resolved'">已解决</el-tag>
<el-tag type="success" v-else-if="scope.row.handleStatus=='close'">关闭</el-tag>
<el-tag type="success" v-else-if="scope.row.handleStatus=='closed'">已关闭</el-tag>
<el-tag v-else>{{scope.row.handleStatus}}</el-tag>
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'bugStatus',scope.row.handleStatus)" :key="index" :type="item.className">{{item.name}}</el-tag>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="receiptMessage" label="处理意见" min-width="150" >
<template slot-scope="scope">
<div style="max-height:100px;overflow:auto;" v-html="scope.row.receiptMessage"></div>
</template>
</el-table-column>
<el-table-column prop="receiptTime" label="时间" width="100" ></el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
</el-row>
@ -38,7 +24,7 @@
<script>
import util from '@/common/js/util';//
//import Sticky from '@/components/Sticky' // header
//import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { initSimpleDicts } from '@/api/mdp/meta/item';//
import { listXmQuestionHandle, delXmQuestionHandle, batchDelXmQuestionHandle } from '@/api/xm/core/xmQuestionHandle';
import { mapGetters } from 'vuex'
@ -73,7 +59,9 @@
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
dicts:{},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
dicts:{
bugStatus:[],
},// params=[{categoryId:'0001',itemCode:'sex'}] {'sex':[{optionValue:'1',optionName:'',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'',seqOrder:'2',fp:'',isDefault:'0'}]}
addFormVisible: false,//xmQuestionHandle
//xmQuestionHandle
@ -93,6 +81,7 @@
}
},//end data
methods: {
...util,
handleSizeChange(pageSize) {
this.pageInfo.pageSize=pageSize;
this.getXmQuestionHandles();
@ -230,6 +219,11 @@
mounted() {
this.$nextTick(() => {
initSimpleDicts('all',[ 'bugStatus' ]).then(res=>{
if(res.data.tips.isOk){
this.dicts=res.data.data
}
});
this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmQuestionHandles();
});

Loading…
Cancel
Save