朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 0399821d8e0559a321789244a1931b5034c71d86 1 个父辈 a2d0e294

运单，总分单发送

内嵌 并排对比
正在显示 2 个修改的文件 包含 126 行增加 和 3 行删除
@@ -20,3 +20,11 @@ export const batchOrderImport = params => { return http.postExcelData(`${baseSer @@ -20,3 +20,11 @@ export const batchOrderImport = params => { return http.postExcelData(`${baseSer
20 export const eldhBatchDeclare = params => { return http.post(`${baseServiceURL2}/ExportListDeclaration/eldhBatchDeclare`, params); }; 20 export const eldhBatchDeclare = params => { return http.post(`${baseServiceURL2}/ExportListDeclaration/eldhBatchDeclare`, params); };
21 //清单批量导入申报 21 //清单批量导入申报
22 export const eldhImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportListDeclaration/eldhImportDeclare`, params); }; 22 export const eldhImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportListDeclaration/eldhImportDeclare`, params); };
  23 +//运单批量申报
  24 +export const eldBatchDeclare = params => { return http.post(`${baseServiceURL2}/ExportLogistics/eldBatchDeclare`, params); };
  25 +//运单批量导入申报
  26 +export const eldImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportLogistics/eldImportDeclare`, params); };
  27 +//总分单批量申报
  28 +export const zfeldBatchDeclare = params => { return http.post(`${baseServiceURL2}/ExportWaybillDeclaration/eldBatchDeclare`, params); };
  29 +//总分单批量导入申报
  30 +export const zfeldImportDeclare = params => { return http.postExcelData(`${baseServiceURL2}/ExportWaybillDeclaration/eldImportDeclare`, params); };
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
50 range-separator="至" 50 range-separator="至"
51 start-placeholder="开始日期" 51 start-placeholder="开始日期"
52 end-placeholder="结束日期" 52 end-placeholder="结束日期"
  53 + value-format="yyyy-MM-dd HH:mm:ss"
53 :picker-options="pickerOptions"> 54 :picker-options="pickerOptions">
54 </el-date-picker> 55 </el-date-picker>
55 </div> 56 </div>
@@ -97,6 +98,36 @@ @@ -97,6 +98,36 @@
97 <el-button size="medium" style="background: none">清单批量导入申报</el-button> 98 <el-button size="medium" style="background: none">清单批量导入申报</el-button>
98 </el-upload> 99 </el-upload>
99 </el-col> 100 </el-col>
  101 + <el-col :span="3">
  102 + <el-button size="medium" @click="ydeldBatchDeclare" style="background: none">运单批量申报</el-button>
  103 + </el-col>
  104 + <el-col :span="4">
  105 + <el-upload
  106 + class="upload-demo"
  107 + action=""
  108 + :before-upload="beforeUpload"
  109 + :http-request="ydbatchDeclareImport"
  110 + :show-file-list="false">
  111 + <el-button size="medium" style="background: none">运单批量导入申报</el-button>
  112 + </el-upload>
  113 + </el-col>
  114 + </el-row>
  115 + </div>
  116 + <div style="margin-bottom: 20px">
  117 + <el-row :gutter="24">
  118 + <el-col :span="3">
  119 + <el-button size="medium" @click="zfbatchOrder" style="background: none">总分单批量申报</el-button>
  120 + </el-col>
  121 + <el-col :span="4">
  122 + <el-upload
  123 + class="upload-demo"
  124 + action=""
  125 + :before-upload="beforeUpload"
  126 + :http-request="zfbatchOrderImport"
  127 + :show-file-list="false">
  128 + <el-button size="medium" style="background: none">总分单批量导入申报</el-button>
  129 + </el-upload>
  130 + </el-col>
100 </el-row> 131 </el-row>
101 </div> 132 </div>
102 133
@@ -113,7 +144,7 @@ @@ -113,7 +144,7 @@
113 <template v-slot:default="{ row }"> 144 <template v-slot:default="{ row }">
114 <el-table 145 <el-table
115 :data="row.exportOrderDeclarationBodyList" 146 :data="row.exportOrderDeclarationBodyList"
116 - style="width: 85%;margin-left: 20px" 147 + style="width: 85%;margin-left: 45px"
117 row-key="id" 148 row-key="id"
118 stripe 149 stripe
119 > 150 >
@@ -197,7 +228,8 @@ @@ -197,7 +228,8 @@
197 </template> 228 </template>
198 229
199 <script> 230 <script>
200 - import {sendOrder,selectLists,batchOrder,batchOrderImport,importExcel,eldhBatchDeclare,eldhImportDeclare} from '../../api/consigner/exportOrder' 231 + import {sendOrder,selectLists,batchOrder,batchOrderImport,importExcel,eldhBatchDeclare,eldhImportDeclare,
  232 + eldBatchDeclare,eldImportDeclare,zfeldBatchDeclare,zfeldImportDeclare} from '../../api/consigner/exportOrder'
201 export default { 233 export default {
202 data() { 234 data() {
203 return { 235 return {
@@ -240,6 +272,8 @@ @@ -240,6 +272,8 @@
240 orderno:'', 272 orderno:'',
241 ordertype:'', 273 ordertype:'',
242 ext1:'', 274 ext1:'',
  275 + starttime:'',
  276 + endtime:'',
243 pageNum:1, 277 pageNum:1,
244 pageSize:20 278 pageSize:20
245 }, 279 },
@@ -280,6 +314,86 @@ @@ -280,6 +314,86 @@
280 this.getList(); 314 this.getList();
281 }, 315 },
282 methods: { 316 methods: {
  317 + //运单批量导入申报
  318 + zfbatchOrderImport({ file, onSuccess, onError }){
  319 + // 生成 FormData 对象
  320 + const formData = new FormData();
  321 + formData.append('file', file);
  322 + zfeldImportDeclare(formData).then((response) => {
  323 + const res = response.data
  324 + if (res.code !== '200') {
  325 + return this.$message.error(res.msg);
  326 + }
  327 + this.$message.success(res.msg);
  328 + this.getList();
  329 + onSuccess(response.data); // 调用 onSuccess 回调通知上传成功
  330 + }).catch(error => {
  331 + // 关闭加载
  332 + this.$message.error(error.toString())
  333 + onError(error); // 调用 onError 回调通知上传失败
  334 + })
  335 + },
  336 + //运单批量申报
  337 + zfbatchOrder(){
  338 + if(this.selectedRows.length!==0){
  339 + this.transformedData = this.selectedRows.map(item => ({
  340 + orderno: item.orderno,
  341 + ext1: item.ext1
  342 + }));
  343 + zfeldBatchDeclare(this.transformedData).then((response)=>{
  344 + const res=response.data;
  345 + if (res.code !== '200') {
  346 + return this.$message.error('总分单批量申报失败！')
  347 + }
  348 + this.$message.success('总分单批量申报成功！');
  349 + this.getList();
  350 + }).catch(error=>{
  351 + this.$message.error(error.toString())
  352 + })
  353 + }else{
  354 + this.$message.error('请选勾取需要申报的总分单信息！');
  355 + }
  356 + },
  357 + //运单批量导入申报
  358 + ydbatchDeclareImport({ file, onSuccess, onError }){
  359 + // 生成 FormData 对象
  360 + const formData = new FormData();
  361 + formData.append('file', file);
  362 + eldImportDeclare(formData).then((response) => {
  363 + const res = response.data
  364 + if (res.code !== '200') {
  365 + return this.$message.error(res.msg);
  366 + }
  367 + this.$message.success(res.msg);
  368 + this.getList();
  369 + onSuccess(response.data); // 调用 onSuccess 回调通知上传成功
  370 + }).catch(error => {
  371 + // 关闭加载
  372 + this.$message.error(error.toString())
  373 + onError(error); // 调用 onError 回调通知上传失败
  374 + })
  375 + },
  376 + //运单批量申报
  377 + ydeldBatchDeclare(){
  378 + if(this.selectedRows.length!==0){
  379 + this.transformedData = this.selectedRows.map(item => ({
  380 + orderno: item.orderno,
  381 + ext1: item.ext1
  382 + }));
  383 + eldBatchDeclare(this.transformedData).then((response)=>{
  384 + const res=response.data;
  385 + if (res.code !== '200') {
  386 + return this.$message.error('运单批量申报失败！')
  387 + }
  388 + this.$message.success('运单批量申报成功！');
  389 + this.getList();
  390 + }).catch(error=>{
  391 + this.$message.error(error.toString())
  392 + })
  393 + }else{
  394 + this.$message.error('请选勾取需要申报的运单信息！');
  395 + }
  396 + },
283 //清单批量导入申报 397 //清单批量导入申报
284 batchDeclareImport({ file, onSuccess, onError }){ 398 batchDeclareImport({ file, onSuccess, onError }){
285 // 生成 FormData 对象 399 // 生成 FormData 对象
@@ -421,7 +535,8 @@ @@ -421,7 +535,8 @@
421 //订单列表查询 535 //订单列表查询
422 getList(){ 536 getList(){
423 if(this.value2 !== null && this.value2 !== ""){ 537 if(this.value2 !== null && this.value2 !== ""){
424 - console.log(this.value2) 538 + this.queryInfo.starttime = this.value2[0];
  539 + this.queryInfo.endtime = this.value2[1];
425 } 540 }
426 selectLists(this.queryInfo).then((response) => { 541 selectLists(this.queryInfo).then((response) => {
427 const res = response.data 542 const res = response.data