diff --git a/src/components/PdfViewer/A4Viewer.vue b/src/components/PdfViewer/A4Viewer.vue index 06ee11ed..b932bf12 100644 --- a/src/components/PdfViewer/A4Viewer.vue +++ b/src/components/PdfViewer/A4Viewer.vue @@ -105,8 +105,8 @@ export default { thisPageCount:1, - scale: 20, - preScale: 20, + scale: 50, + preScale: 50, pdfUtils:new PdfUtils(), @@ -133,7 +133,7 @@ export default { }, thisPageCount(value) { if(this.isA4){ - this.doScale(75); + this.doScale(50); }else{ this.doScale(20); } diff --git a/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue b/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue index 69b52423..10dac4a5 100644 --- a/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue +++ b/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue @@ -72,6 +72,10 @@ pageNum:1, pageSize:20, packNo:this.value, + packStatus:0, + params:{ + blValid:1, + } } }; }, diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 45816db7..1f3f126d 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -80,14 +80,6 @@ v-hasPermi="['emis:emisTmsPack:query']" @click="getQuery" >查询 - 去组包 - 去组包 --> + + + @@ -126,7 +118,10 @@ :showSearch.sync="showSearch" :queryParams="queryWaitParams" :total="waitTotal" + :showRightButton="false" + :showOperateButton="false" + @queryTable="handleQueryWait" @selection-change="handleWaitSelectionChange" @sort-change="handleSortChange" @@ -285,7 +280,10 @@ :showSearch.sync="showSearch" :queryParams="queryParams" :total="total" + :showRightButton="false" + :showOperateButton="false" + @queryTable="handleQuery" @selection-change="handleSelectionChange" @sort-change="handleSortChange" @@ -406,7 +404,7 @@ - + @@ -1627,7 +1625,7 @@ export default { this.computeTotal(); this.currentId=null; this.openForm= true; - this.titleForm = "修改合包"; + this.titleForm = "查看"; }, handleView(row) { this.id=row.id; diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue index 604dc4d0..2bb0eed0 100644 --- a/src/views/emis/emisTmsScanRecord/unpackScan.vue +++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue @@ -3,20 +3,20 @@ - + - {{$t('扫描单号')}} + {{$t('扫描包号')}} - + diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index faf42487..4f109ff8 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -847,8 +847,8 @@ export default { timezoneOffset: null, delFlag: null, remark: null, + blSign:null, params:{ - blSign:null, expireNotSign:null, problemQueryType:null, } diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index b8901b51..9bfcec4f 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -73,7 +73,7 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -58,7 +58,7 @@ export default { form: { // status: "2" }, - billCode: '', + probId: this.promInfo.id, // 表单校验 rules: { id: [ @@ -79,8 +79,8 @@ export default { watch: { "promInfo": { handler (newValue, oldValue) { - this.promInfo = newValue; - this.billCode = this.promInfo.billCode; + this.promInfo=newValue; + this.probId = this.promInfo.id; this.initData(); }, deep: true @@ -94,8 +94,6 @@ export default { initData() { this.reset(); - - // if(this.id !=null) { // this.loading = true; // getEmisWaybillProblemFaq(this.id).then(response => { @@ -126,7 +124,7 @@ export default { billCode: null, title: null, content: null, - // status: null, + dealResult: null, showFlag: null, replayId: null, delFlag: null, @@ -157,6 +155,7 @@ export default { title: this.promInfo.problemTitle, content: this.form.content,//具体内容 status: this.form.status,//状态 + dealResult: this.form.dealResult,//状态 replayId: this.$store.getters.empCode,//针对的回复的ID createBy: this.$store.getters.empName, createTime: parseTime(new Date()), @@ -173,32 +172,7 @@ export default { } }); }, - // /** 转换菜单数据结构 */ - // normalizer(node) { - // if (node.children && !node.children.length) { - // delete node.children; - // } - // return { - // id: node.id, - // label: node.idName, - // children: node.children - // }; - // }, - // /** 查询菜单下拉树结构 */ - // getTreeselect() { - // const queryParams = {} - // listEmisWaybillProblemFaq(queryParams).then(response => { - // this.emisWaybillProblemFaqOptions = []; - // const rootItem = { idId: 0, emisWaybillProblemFaqName: '-', children: [] }; - // rootItem.children = this.handleTree(response.data, "id"); - // this.emisWaybillProblemFaqOptions.push(rootItem); - // if(this.parentId != undefined) { - // this.form.parentId = this.parentId; - // } - - // }); - // }, } }; diff --git a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue index cd39d177..71ee916b 100644 --- a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue +++ b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue @@ -24,8 +24,8 @@ import { listEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq"; export default { name:'CommentPanel', props:{ - billCode:{ - type:String + probId:{ + type:[String,Number] }, }, data(){ @@ -47,19 +47,14 @@ export default { queryParams: { pageNum: 1, pageSize: 20, - billCode: this.billCode + probId: this.probId }, } }, watch: { - "billCode": { + "probId": { handler (newValue, oldValue) { - this.billCode = newValue; - this.queryParams = { - pageNum: 1, - pageSize: 20, - billCode: newValue - } + this.queryParams.probId =newValue; this.getList(); }, deep: true @@ -70,6 +65,9 @@ export default { }, methods: { getList() { + if(!this.probId){ + return; + } listEmisWaybillProblemFaq(this.queryParams).then(response => { this.emisWaybillProblemFaqList = response.rows; }); diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index 07dd0efb..f2053d33 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -62,7 +62,7 @@ {{ parseTime(scope.row.reversionDate) }} - +