aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-06-28 14:27:59 +08:00
commit ab9e3fc72c
3 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue
View File

@ -1,7 +1,9 @@
<template>
<div >
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<div v-if="hideSubmit"></div>
<div v-else>
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="处理状态" prop="dealResult">
<!-- <el-input v-model="form.status" placeholder="" /> -->
@ -17,18 +19,17 @@
<el-input v-model="form.content" type="textarea" placeholder="请输入具体内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<el-scrollbar class="kr-designer-tool_con">
<!-- <Panel class="control-panel" /> -->
<CommentPanel ref="comment" :probId="probId" ></CommentPanel>
</el-scrollbar>
</div>
<el-scrollbar class="kr-designer-tool_con">
<!-- <Panel class="control-panel" /> -->
<CommentPanel ref="comment" :probId="probId" ></CommentPanel>
</el-scrollbar>
</div>
</template>
@ -42,8 +43,11 @@ export default {
name: "emisWaybillProblemFaqForm",
props:{
promInfo:{
type:Object
type:Object
},
hideSubmit: {
type: Boolean
}
},
components: { CommentPanel, Panel },
dicts: [
@ -58,6 +62,7 @@ export default {
form: {
// status: "2"
},
hideSubmit: false,
probId: this.promInfo.id,
// 表单校验
rules: {
@ -84,6 +89,13 @@ export default {
this.initData();
},
deep: true
},
"hideSubmit": {
handler (newValue, oldValue) {
this.hideSubmit=newValue;
this.initData();
},
deep: true
}
},
created() {
@ -92,6 +104,7 @@ export default {
methods: {
initData() {
debugger;
this.reset();
// if(this.id !=null) {

2
src/views/emis/emisWaybillProblemFaq/commentPanel.vue
View File

@ -5,7 +5,7 @@
<span class="author-name">
{{ item.createByName }}
<span class="author-status1" v-if="item.dealResult=='1'">{{ $t('[处理中]') }}</span>
<span class="author-status" v-if="item.dealResult=='2'">{{ $t('[处理完毕]') }}</span>
<span class="author-status2" v-if="item.dealResult=='2'">{{ $t('[处理完毕]') }}</span>
<span class="author-time">{{ item.createTime }}</span>
</span>
</div>

106
src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
View File

@ -60,20 +60,19 @@
<!-- </search-form> -->
</el-row >
<xd-table v-loading="loading"
border
ref="singleSelectTable"
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@select="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
:header-cell-class-name="cellClass"
>
<Xd-table v-loading="loading"
border
ref="singleSelectTable"
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@select="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -112,14 +111,19 @@
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column width="40" align="center" >
<template slot-scope="scope">
<el-radio class="radio" :label="scope.row" v-model="radio" @change.native="getCurrentRow(scope.row)" >&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column :label="$t('单号')" align="center" prop="queryType" min-width="170">
<template slot-scope="scope">
<span>{{scope.row.queryType=="1"?scope.row.billCode:scope.row.orderSN}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('回复状态')" align="center" prop="blReversion" min-width="100" >
<template slot-scope="scope">
<span v-if="scope.row.blReversion == '0'" style="background-color: #ff69b4;">{{ $t("未回复") }}</span>
@ -187,47 +191,13 @@
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="dataFrom" min-width="150" />
</xd-table>
</Xd-table>
<el-divider class="divider"></el-divider>
<el-row :gutter="0" class="reversion" v-show="showProblemDetail">
<el-row :gutter="0" class="reversion-title">
{{$t('问题件回复')}}
</el-row>
<el-row :gutter="0" >
<el-col :span="8">
<el-col :span="8" class="labeltext">
{{$t('登记网点联系人和电话')}}
</el-col>
<el-col :span="16" class="labelcontent">
<el-row>
{{$t("登记网点：") + (reversion.registerSiteCode || '总部')}}
</el-row>
<el-row>
{{$t("负责人：") + (reversion.registerManCode || '未填写')}}
</el-row>
<el-row>
{{$t("联系电话：") + (reversion.empPhone || '未填写')}}
</el-row>
</el-col>
</el-col>
<el-col :span="8">
<el-col :span="6"class="labeltext">
{{$t('问题原因：')}}
</el-col>
<el-col :span="18" class="labelcontent">
<el-row>
{{(reversion.problemCause || "暂无")}}
</el-row>
</el-col>
</el-col>
<el-col :span="8" class="labeltext">
<el-row >{{$t('回复列表：')}}</el-row>
<el-row>
<Comments ref="commentList" :billCode="currentRow.billCode"/>
</el-row>
</el-col>
</el-row >
</el-row>
<!-- 评论 -->
<el-drawer title="问题件回复" width="50%" :visible.sync="openComment" @close="commentDone" direction="rtl">
<CommentInfoForm :hideSubmit="true" :promInfo="selData" @on-changed="commentDone" @on-cancel="commentCancel"> </CommentInfoForm>
</el-drawer>
</div>
</template>
@ -235,6 +205,7 @@
import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
import { listEmisWaybill } from "@/api/emis/emisWaybill";
import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
import CommentInfoForm from '@/views/emis/emisWaybillProblemFaq/commentInfoForm.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
@ -249,7 +220,7 @@ import { formatSearchStr } from '@/utils/index'
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "ReceivedProblemInquiries",
components: { Comments, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker },
components: { Comments, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker, CommentInfoForm },
dicts: ['emis_scan_type'],
data() {
@ -277,6 +248,11 @@ export default {
openForm: false,
titleForm: "",
openComment:false,
radio: '',
selData: {},
titleEmisElectronicPagApply: "",
openEmisElectronicPagApply: false,
@ -385,6 +361,7 @@ export default {
/** 查询扫描记录列表 */
getList() {
this.loading = true;
this.radio='';
console.log("---->this.queryParams,", this.queryParams);
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
this.queryParams.params.beginRegisterDate = dateToStr(new Date(this.dateTimeRange[0]));
@ -546,6 +523,13 @@ export default {
};
this.resetForm("form");
},
getCurrentRow(val) {
debugger;
this.selData = val;
// 显示内容
this.openComment=true;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -724,6 +708,14 @@ export default {
// todo
},
commentDone(){
// this.selData = val;
this.openComment=false;
this.getList();
},
commentCancel(){
this.openComment=false;
},
handleFormChanged(){
this.openForm = false;
this.getList();