diff --git a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue index 5a1ed228..ccc5a583 100644 --- a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue +++ b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue @@ -1,7 +1,9 @@ @@ -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) { diff --git a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue index 52483262..19cf6bec 100644 --- a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue +++ b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue @@ -5,7 +5,7 @@ {{ item.createByName }} {{ $t('[处理中]') }} - {{ $t('[处理完毕]') }} + {{ $t('[处理完毕]') }} {{ item.createTime }} diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue index ac1fcfe8..15350079 100644 --- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue @@ -60,20 +60,19 @@ - +
@@ -112,14 +111,19 @@
- - + + + + + -
+
+ - - - {{$t('问题件回复')}} - - - - - {{$t('登记网点联系人和电话')}} - - - - {{$t("登记网点:") + (reversion.registerSiteCode || '总部')}} - - - {{$t("负责人:") + (reversion.registerManCode || '未填写')}} - - - {{$t("联系电话:") + (reversion.empPhone || '未填写')}} - - - - - - {{$t('问题原因:')}} - - - - {{(reversion.problemCause || "暂无")}} - - - - - {{$t('回复列表:')}} - - - - - - + + + + @@ -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();