diff --git a/src/views/emis/emisTmsPack/packPrintList.vue b/src/views/emis/emisTmsPack/packPrintList.vue index 80468729..69d2efe9 100644 --- a/src/views/emis/emisTmsPack/packPrintList.vue +++ b/src/views/emis/emisTmsPack/packPrintList.vue @@ -1,6 +1,6 @@ - + - - - + 新增 + >新增合包条码 - + >预览合包条码 + + + 打印合包条码 + 删除 - + + + - - - - - - - - + + + - 修改 - - - + + 已打印 + + + 待打印 + + + + + + + + @@ -160,11 +109,6 @@ - @@ -218,7 +162,7 @@ export default { pageNum: 1, pageSize: 20, packNo: null, - packStatus: null, + packStatus: '0', printStatus: null, }, }; @@ -227,23 +171,41 @@ export default { this.getList(); }, methods: { + handleBatchPrint(){ + this.$confirm("确定打印?", "提示", { + cancelButtonText: "不打印", + confirmButtonText: "确定打印", + type: "warning", + distinguishCancelAndClose: true, + closeOnClickModal: false + }).then(() => { + let orderList=[]; + this.currentSelection.forEach(item=>{ + orderList.push(item.billCode); + }); + this.$refs.tanexPrinter.batchPrint(orderList,null,true); + }).catch(() => {}); + + }, + handlePrintPreview(){ + let orderList=[]; + this.currentSelection.forEach(item=>{ + orderList.push(item.billCode); + }); + this.$refs.tanexPrinter.printPreview(orderList,true); + }, + handleDownPDF(){ + let orderList=[]; + this.currentSelection.forEach(item=>{ + orderList.push(item.billCode); + }); + this.$refs.tanexPrinter.downPDF(orderList,true); + }, /** 查询TMS合包列表 */ getList() { this.loading = true; - this.queryParams.params = {}; - if (null != this.daterangePrintDate && '' != this.daterangePrintDate) { - this.queryParams.params["beginPrintDate"] = this.daterangePrintDate[0]; - this.queryParams.params["endPrintDate"] = this.daterangePrintDate[1]; - } - if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) { - this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0]; - this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1]; - } - if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) { - this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0]; - this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1]; - } - listEmisTmsPack(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => { + + listEmisTmsPack(this.queryParams).then(response => { this.emisTmsPackList = response.rows; this.total = response.total; this.loading = false; diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue index c2b83fc1..55745869 100644 --- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue +++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue @@ -73,7 +73,7 @@ type="primary" plain size="mini" - v-hasPermi="['emis:emisTmsSiteBatchLoading:query']" + v-hasPermi="['emis:emisTmsSiteBatch:query']" @click="getQuery" >查询 去组批次 修改 删除 下载批次文件 @@ -300,7 +300,7 @@ @sort-change="handleSortChange" > - + @@ -363,7 +363,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -890,7 +890,7 @@ export default { waitPackList:[],//选择未组包的运单先保存起来,在后续新增组批次的弹框中使用 // 新增/修改弹窗数据 coData: { - + }, // 新增/修改包详情数据 emisCoPackDetail:[], @@ -1043,7 +1043,7 @@ export default { let mainBillCode=item.substr(0,14); newBillCodeStr=newBillCodeStr+mainBillCode+","; }else if(item == ""){ - + }else{ newBillCodeStr=newBillCodeStr+item+","; } @@ -1074,7 +1074,7 @@ export default { this.multiple = true; if(null != this.dateTimeRange && '' != this.dateTimeRange){ this.queryWaitParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0])); - this.queryWaitParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1])); + this.queryWaitParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1])); } // this.queryWaitParams.packNo = this.queryParams.packNo; this.queryWaitParams.receiveCountry = this.queryParams.receiveCountry; @@ -1089,7 +1089,7 @@ export default { let mainBillCode=item.substr(0,14); newBillCodeStr=newBillCodeStr+mainBillCode+","; }else if(item == ""){ - + }else{ newBillCodeStr=newBillCodeStr+item+","; } @@ -1128,7 +1128,7 @@ export default { this.loadingDone = true; if(null != this.dateTimeRange && '' != this.dateTimeRange){ this.queryDoneParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0])); - this.queryDoneParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1])); + this.queryDoneParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1])); } // this.queryDoneParams.packNo = this.queryParams.packNo; if(this.queryParams.billCode){ @@ -1140,7 +1140,7 @@ export default { let mainBillCode=item.substr(0,14); newBillCodeStr=newBillCodeStr+mainBillCode+","; }else if(item == ""){ - + }else{ newBillCodeStr=newBillCodeStr+item+","; } @@ -1197,7 +1197,7 @@ export default { let mainBillCode=item.substr(0,14); newBillCodeStr=newBillCodeStr+mainBillCode+","; }else if(item == ""){ - + }else{ newBillCodeStr=newBillCodeStr+item+","; } @@ -1390,10 +1390,10 @@ export default { } } //第二步:处理运单列表的数据 - + //2.1:计算要删除的运单,提到“删除”按钮的操作逻辑 // let tempDelList = []; - // + // // tempDelList = this.tempExistCoPackWayBillList.filter(item => { // let ls = this.emisCoPackDetail.filter(cd => { // return cd.billCode == item.billCode @@ -1616,7 +1616,7 @@ export default { } } this.tempExistCoPackWayBillList = afterList;//this.tempExistCoPackWayBillList.filter(item => {idsArrTemp.indexOf(item.id) == -1}) - + this.computeTotal(); // 更新主表 this.tempCoPackInfo.destCountry = this.coData.destCountry; @@ -1732,7 +1732,7 @@ export default { { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }, { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' } ]; - + this.coData.startSiteCode = this.$store.getters.ownerSiteCode; this.coData.startSiteName=this.$store.getters.ownerSiteName; @@ -1797,7 +1797,7 @@ export default { // this.coData.totalVolume = resData.totalVolume || null; // this.coData.totalWeight = resData.totalWeight || null; - + this.emisCoPackDetail=[]; let resList = await listEmisTmsSiteBatchDtl({batchNo: resData.batchNo}); if(!resList || resList.code != 200){ @@ -1811,7 +1811,7 @@ export default { } this.coData.packStatus = this.tempCoPackInfo.packStatus; this.coData.scanDate = this.tempCoPackInfo.scanDate; - + let resLoadingList = await listEmisTmsSiteBatchLoading({batchNo: resData.batchNo}); if(!resLoadingList || resLoadingList.code != 200){ this.$message.error(resLoadingList && resLoadingList.msg || "未知错误"); diff --git a/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue b/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue index 56276977..defe5780 100644 --- a/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue +++ b/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue @@ -77,7 +77,7 @@ - + @@ -122,20 +122,20 @@ - + - + - + 确 定 取 消 - + @@ -186,7 +186,7 @@ export default { methods: { async initData() { - + if(this.id !=null) { this.loading = true; getEmisTmsSiteBatch(this.id).then(response => { @@ -268,7 +268,7 @@ export default { } }); }, - + } }; diff --git a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue index 2703a54e..deb292fb 100644 --- a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue +++ b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue @@ -19,8 +19,10 @@ 确 定 取 消 - - + + + + @@ -34,7 +36,7 @@ export default { props:{ promInfo:{ type:Object - } + }, }, components: { CommentPanel }, dicts: [ @@ -44,6 +46,7 @@ export default { emisWaybillProblemFaqOptions: [], // 遮罩层 loading: true, + // 表单参数 form: {}, // 表单校验 @@ -78,16 +81,19 @@ export default { methods: { initData() { + this.reset(); - if(this.id !=null) { - this.loading = true; - getEmisWaybillProblemFaq(this.id).then(response => { - this.form = response.data; - this.loading = false; - }); - }else{ - this.reset(); - } + + + // if(this.id !=null) { + // this.loading = true; + // getEmisWaybillProblemFaq(this.id).then(response => { + // this.form = response.data; + // this.loading = false; + // }); + // }else{ + + // } // this.getTreeselect(); }, // 取消按钮 @@ -121,17 +127,10 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.id != null) { - updateEmisWaybillProblemFaq(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); - this.$emit("on-changed"); - }); - } else { - addEmisWaybillProblemFaq(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); + addEmisWaybillProblemFaq(this.form).then(response => { + this.$modal.msgSuccess("新增成功"); this.$emit("on-changed"); }); - } } }); }, diff --git a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue new file mode 100644 index 00000000..3fca271c --- /dev/null +++ b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue @@ -0,0 +1,178 @@ + + + + + {{item.name}} + {{item.time}} + + + + {{item.content}} + + + + + + + +
+ {{item.content}} +