diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index 508b2099..3f17cfaf 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -65,6 +65,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -157,14 +172,19 @@
-
-
+
+
{{ parseTime(scope.row.registerDate) }}
-
-
+
+
+
+
+
+
+
@@ -181,7 +201,7 @@
{{ parseTime(scope.row.registerSaveDate) }}
-
+
@@ -233,11 +253,13 @@ import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
-
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "CentralProblemInquiry",
- components: { ProblemTypePicker, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker },
+ components: { ProblemTypePicker, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker, EmpNamePicker1, EmpNamePicker2, EmpNamePicker3 },
dicts: ['emis_scan_type', 'emis_processing_status'],
data() {
@@ -701,7 +723,30 @@ export default {
if (j === 'index') {
return ++index
}
-
+ if(j==='queryType'){
+ if( this.queryParams.queryType== 1){
+ return v['billCode']
+ }else{
+ return v['orderSn']
+ }
+ }
+ if(j==='blReversion'){
+ return v[j] == 0 ? '未回复': '已回复'
+ }
+ if(j === 'dealResult'){
+ if(v[j]==='1'){
+ return '处理中'
+ }else if(v[j]==='2'){
+ return '处理完毕'
+ }else if(v[j]==='0' && v['blSee']==='1'){
+ return '已查看未处理'
+ }else{
+ return '未处理'
+ }
+ }
+ if(j==='blSee'){
+ return v[j] == "1"? '是': '否'
+ }
return v[j]
}))
},
@@ -709,6 +754,9 @@ export default {
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
+ onSalemanChange(){
+ this.queryParams.sendSiteCode=null;
+ },
/** 时间搜索响应函数 */
// dateTimeChange(value){
// this.dateTimeRange=value;
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 9db37192..8c82e154 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -55,6 +55,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -137,14 +152,18 @@
-
-
+
+
{{ parseTime(scope.row.registerDate) }}
-
-
+
+
+
+
+
+
@@ -228,13 +247,16 @@ import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import Comments from '@/views/emis/EmisBaseTools/Comments.vue';
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "ReceivedProblemInquiries",
components: { Comments, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker,
- CommentInfoForm
+ CommentInfoForm, EmpNamePicker1, EmpNamePicker2, EmpNamePicker3
},
dicts: ['emis_scan_type'],
data() {
@@ -856,6 +878,9 @@ export default {
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
+ onSalemanChange(){
+ this.queryParams.sendSiteCode=null;
+ },
/** 时间搜索响应函数 */
// dateTimeChange(value){
// this.dateTimeRange=value;
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index 9ec98b98..0d43332a 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -55,6 +55,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -97,7 +112,7 @@
type="primary"
plain
size="mini"
- @click="getList"
+ @click="handleExport"
>导出
@@ -141,14 +156,19 @@
-
-
+
+
{{ parseTime(scope.row.registerDate) }}
-
-
+
+
+
+
+
+
+
@@ -165,7 +185,7 @@
{{ parseTime(scope.row.registerSaveDate) }}
-
+
@@ -226,11 +246,14 @@ import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import Comments from '@/views/emis/EmisBaseTools/Comments.vue';
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "ReceivedProblemInquiries",
- components: { Comments, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker, CommentInfoForm },
+ components: { Comments, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker, CommentInfoForm, EmpNamePicker1, EmpNamePicker2, EmpNamePicker3 },
dicts: ['emis_scan_type'],
data() {
@@ -755,73 +778,52 @@ export default {
this.getList();
}).catch(() => {});
},
- /** 导出按钮操作 */
- handleExport() {
- // this.download('emis/emisElectronicPagApply/export', {
- // ...this.queryParams
- // }, `emisElectronicPagApply_${new Date().getTime()}.xlsx`)
- const loadingInstance = this.$loading({
+ /** 列索引函数 */
+ getIndex($index) {
+ return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+ },
+ onSalemanChange(){
+ this.queryParams.sendSiteCode=null;
+ },
+ /** 时间搜索响应函数 */
+ // dateTimeChange(value){
+ // this.dateTimeRange=value;
+ // },
+ /** 导出按钮操作 */
+ handleExport() {
+ const loadingInstance = this.$loading({
text: '正在导出...'
- })
- var qParam = {...this.queryParams};
- qParam.pageNum=1;
- qParam.pageSize=5000;
- if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
- this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
+ })
+
+ if(this.selectionList&&this.selectionList.length>0){
+ this.exportData(this.selectionList,loadingInstance);
}
- this.queryParams.params["queryType"] = this.queryParams.queryType;//1：yd;2：dd;
- this.queryParams.params["isSubBill"] = this.queryParams.isSubBill;//1：子单；0：主单
-
- listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
- this.downloadLoading = false
- if (response.code === 200) {
- const curList = []
- for (let index = 0; index < response.rows.length; index++) {
- let scanRstItem = response.rows[index];
- let record =Object.assign({}, scanRstItem)
- record.orderType = this.queryParams.orderType;
- record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- curList.push(record);
- }
- import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['id','单号','单号类型','车牌号','扫描时间','扫描类型','扫描网点','上/下一网点','扫描员','录入时间','扫描重量'];
- const filterVal = ['id','billCode','orderType','carNo','scanDate','scanType','scanSite','preOrNextStation','scanMan','createTime','scanWeight'];
- const data = this.formatJson(filterVal, curList, curList)
- excel.export_json_to_excel({
- header: tHeader,
- data,
- filename: '网点电子面单申请',
- autoWidth: true
- })
- loadingInstance.close()
- })
- }
- });
-
- // listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
- // this.emisElectronicPagApplyList = [];
- // this.loading = false;
- // let rows = response.rows;
- // this.total = response.total;
- // if(!rows || rows.length == 0){
- // this.$modal.msgError("未查到单号");
- // return;
- // }
- // for (let index = 0; index < rows.length; index++) {
- // let scanRstItem = rows[index];
- // console.log(scanRstItem);
-
- // let record =Object.assign({}, scanRstItem)
- // record.orderType = this.queryParams.orderType;
- // record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- // record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- // this.emisElectronicPagApplyList.push(record);
- // }
- // });
-
-
+ else{
+ let qParam={...this.queryParams}
+ qParam.pageNum=1;
+ qParam.pageSize=20000;
+ listEmisWaybillProblemInfo(qParam).then(response => {
+ if (response.code === 200) {
+ this.exportData(response.rows,loadingInstance);
+ }
+ });
+ }
+ },
+ exportData(selData,loadingInstance){
+ const curList =selData
+ import('@/vendor/Export2Excel').then(excel => {
+ const exportParam=this.$refs.singleSelectTable.getExportParam();
+ const tHeader = exportParam.header;
+ const filterVal = exportParam.filter;
+ const data = this.formatJson(filterVal, curList, selData)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '登记问题件查询列表',
+ autoWidth: true
+ })
+ loadingInstance.close()
+ })
},
formatJson(filterVal, jsonData, resData) {
let index = 0
@@ -829,24 +831,33 @@ export default {
if (j === 'index') {
return ++index
}
- if (j === 'status') {
- var statusStr='xxx'
- if(v[j] == 10){
- statusStr='xxx'
+ if(j==='queryType'){
+ if( this.queryParams.queryType== 1){
+ return v['billCode']
+ }else{
+ return v['orderSn']
}
- return statusStr;
+ }
+ if(j==='blReversion'){
+ return v[j] == 0 ? '未回复': '已回复'
+ }
+ if(j === 'dealResult'){
+ if(v[j]==='1'){
+ return '处理中'
+ }else if(v[j]==='2'){
+ return '处理完毕'
+ }else if(v[j]==='0' && v['blSee']==='1'){
+ return '已查看未处理'
+ }else{
+ return '未处理'
+ }
+ }
+ if(j==='blSee'){
+ return v[j] == "1"? '是': '否'
}
return v[j]
}))
},
- /** 列索引函数 */
- getIndex($index) {
- return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
- },
- /** 时间搜索响应函数 */
- // dateTimeChange(value){
- // this.dateTimeRange=value;
- // },
}
};