朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 d2148ea8b60b9246706e16ce626ce3cf14a928ec 1 个父辈 d091e094

库存管理新增分批出库、分批改单、查看明细功能

内嵌 并排对比
正在显示 3 个修改的文件 包含 364 行增加 和 113 行删除
@@ -17,6 +17,10 @@ export const selectBywaybillandFhl = params => { return axios.get(`${baseService @@ -17,6 +17,10 @@ export const selectBywaybillandFhl = params => { return axios.get(`${baseService
17 export const selectNewInventroyrecords = params => { return axios.get(`${baseServiceURL}/newinventroyrecord/selectNewInventroyrecords`, { params: params }); }; 17 export const selectNewInventroyrecords = params => { return axios.get(`${baseServiceURL}/newinventroyrecord/selectNewInventroyrecords`, { params: params }); };
18 //出库 18 //出库
19 export const ExtNewinventroyrecord = params => { return axios.get(`${baseServiceURL}/newinventroyrecord/ExtNewinventroyrecord`, { params: params }); }; 19 export const ExtNewinventroyrecord = params => { return axios.get(`${baseServiceURL}/newinventroyrecord/ExtNewinventroyrecord`, { params: params }); };
  20 +//分批出库
  21 +export const batchoutbound = params => { return http.post(`${baseUrl2}/batchoutbound`,params)};
  22 +//分批改单
  23 +export const batchchangewaybill = params => { return http.post(`${baseUrl2}/batchchangewaybill`,params)};
20 24
21 //场站管理 25 //场站管理
22 export const selectStations = params => { return axios.get(`${baseUrl}/selectStations`, { params: params }); }; 26 export const selectStations = params => { return axios.get(`${baseUrl}/selectStations`, { params: params }); };
@@ -169,41 +169,59 @@ @@ -169,41 +169,59 @@
169 </el-row> 169 </el-row>
170 <!-- 分批出库--> 170 <!-- 分批出库-->
171 <el-row> 171 <el-row>
172 - <el-dialog :title="detaFhl" :visible.sync="fhlDialog" width="40%" >  
173 - <el-form :model="fhlForm" :rules="fhlRules" ref="fhlForm" style="margin-top: 40px"> 172 + <el-dialog :title="detaOut" :visible.sync="outDialog" width="40%" >
  173 + <el-form :model="outForm" :rules="outRules" ref="outForm" style="margin-top: 40px">
174 <el-row> 174 <el-row>
175 <el-col :span="8"> 175 <el-col :span="8">
176 - <el-form-item label="" :label-width="formLabelWidth" prop="billfhl">  
177 - <el-input placeholder="请输入更改后的分单号" v-model="fhlForm.billfhl" autocomplete="off" size="small" style="width: 400px">  
178 - <template slot="prepend">更改分单号为：</template> 176 + <el-form-item label=" " :label-width="formLabelWidth" prop="batchpcs">
  177 + <el-input placeholder="请输入件数" v-model="outForm.batchpcs" autocomplete="off" size="small" style="width: 400px">
  178 + <template slot="prepend">件数：</template>
  179 + </el-input>
  180 + </el-form-item>
  181 + </el-col>
  182 + </el-row>
  183 + <el-row>
  184 + <el-col :span="8">
  185 + <el-form-item label=" " :label-width="formLabelWidth" prop="batchweight">
  186 + <el-input placeholder="请输入重量" v-model="outForm.batchweight" autocomplete="off" size="small" style="width: 400px">
  187 + <template slot="prepend">重量：</template>
  188 + </el-input>
  189 + </el-form-item>
  190 + </el-col>
  191 + </el-row>
  192 + <el-row>
  193 + <el-col :span="8">
  194 + <el-form-item label=" " :label-width="formLabelWidth" prop="batchgoodssize">
  195 + <el-input placeholder="请输入尺寸" v-model="outForm.batchgoodssize" autocomplete="off" size="small" style="width: 400px">
  196 + <template slot="prepend">尺寸：</template>
179 </el-input> 197 </el-input>
180 </el-form-item> 198 </el-form-item>
181 </el-col> 199 </el-col>
182 </el-row> 200 </el-row>
183 </el-form> 201 </el-form>
184 <div slot="footer" class="dialog-footer"> 202 <div slot="footer" class="dialog-footer">
185 - <el-button @click="fhlDialog = false" size="small">取 消</el-button>  
186 - <el-button type="primary" @click="fhlEdit()" size="small">提 交</el-button> 203 + <el-button @click="outDialog = false" size="small">取 消</el-button>
  204 + <el-button type="primary" @click="outEdit()" size="small">提 交</el-button>
187 </div> 205 </div>
188 </el-dialog> 206 </el-dialog>
189 </el-row> 207 </el-row>
190 <!-- 分批改单--> 208 <!-- 分批改单-->
191 <el-row> 209 <el-row>
192 - <el-dialog :title="detaFhl" :visible.sync="fhlDialog" width="40%" >  
193 - <el-form :model="fhlForm" :rules="fhlRules" ref="fhlForm" style="margin-top: 40px"> 210 + <el-dialog :title="detaChange" :visible.sync="changeDialog" width="40%" >
  211 + <el-form :model="changeForm" :rules="changeRules" ref="changeForm" style="margin-top: 40px">
194 <el-row> 212 <el-row>
195 <el-col :span="8"> 213 <el-col :span="8">
196 - <el-form-item label="" :label-width="formLabelWidth" prop="billfhl">  
197 - <el-input placeholder="请输入更改后的分单号" v-model="fhlForm.billfhl" autocomplete="off" size="small" style="width: 400px">  
198 - <template slot="prepend">更改分单号为：</template> 214 + <el-form-item label=" " :label-width="formLabelWidth" prop="newwaybill">
  215 + <el-input placeholder="请输入更改后的单号" v-model="changeForm.newwaybill" autocomplete="off" size="small" style="width: 400px">
  216 + <template slot="prepend">单号：</template>
199 </el-input> 217 </el-input>
200 </el-form-item> 218 </el-form-item>
201 </el-col> 219 </el-col>
202 </el-row> 220 </el-row>
203 </el-form> 221 </el-form>
204 <div slot="footer" class="dialog-footer"> 222 <div slot="footer" class="dialog-footer">
205 - <el-button @click="fhlDialog = false" size="small">取 消</el-button>  
206 - <el-button type="primary" @click="fhlEdit()" size="small">提 交</el-button> 223 + <el-button @click="changeDialog = false" size="small">取 消</el-button>
  224 + <el-button type="primary" @click="changeEdit()" size="small">提 交</el-button>
207 </div> 225 </div>
208 </el-dialog> 226 </el-dialog>
209 </el-row> 227 </el-row>
@@ -213,7 +231,7 @@ @@ -213,7 +231,7 @@
213 <el-form :model="fhlForm" :rules="fhlRules" ref="fhlForm" style="margin-top: 40px"> 231 <el-form :model="fhlForm" :rules="fhlRules" ref="fhlForm" style="margin-top: 40px">
214 <el-row> 232 <el-row>
215 <el-col :span="8"> 233 <el-col :span="8">
216 - <el-form-item label="" :label-width="formLabelWidth" prop="billfhl"> 234 + <el-form-item label=" " :label-width="formLabelWidth" prop="billfhl">
217 <el-input placeholder="请输入更改后的分单号" v-model="fhlForm.billfhl" autocomplete="off" size="small" style="width: 400px"> 235 <el-input placeholder="请输入更改后的分单号" v-model="fhlForm.billfhl" autocomplete="off" size="small" style="width: 400px">
218 <template slot="prepend">更改分单号为：</template> 236 <template slot="prepend">更改分单号为：</template>
219 </el-input> 237 </el-input>
@@ -422,81 +440,86 @@ @@ -422,81 +440,86 @@
422 </el-dialog> 440 </el-dialog>
423 </el-row> 441 </el-row>
424 <!-- //查看货物明细--> 442 <!-- //查看货物明细-->
425 - <el-row>  
426 - <el-dialog :title="detaMap" :visible.sync="detaDialog" width="70%" >  
427 - <el-form :model="detaForm" :rules="detaRules" ref="detaForm" style="margin-top: 40px;padding-bottom: 30px">  
428 - <el-row>  
429 - <el-col :span="7">  
430 - <el-form-item label="" :label-width="formLabelWidth" prop="dest4">  
431 - <el-input disabled v-model="detaForm.dest4" autocomplete="off" size="small" style="width: 300px">  
432 - <template slot="prepend">代理人名称</template>  
433 - </el-input>  
434 - </el-form-item>  
435 - </el-col>  
436 - <el-col :span="8">  
437 - <el-form-item label="" :label-width="formLabelWidth" prop="shpcomid">  
438 - <el-input disabled v-model="detaForm.shpcomid" autocomplete="off" size="small" style="width: 300px">  
439 - <template slot="prepend">代理人代码</template>  
440 - </el-input>  
441 - </el-form-item>  
442 - </el-col>  
443 - <el-col :span="8">  
444 - <el-form-item label="" :label-width="formLabelWidth" prop="optime">  
445 - <el-input disabled v-model="detaForm.optime" autocomplete="off" size="small" style="width: 300px">  
446 - <template slot="prepend">入库时间</template>  
447 - </el-input>  
448 - </el-form-item>  
449 - </el-col>  
450 - </el-row>  
451 - <el-row>  
452 - <el-col :span="7">  
453 - <el-form-item label="" :label-width="formLabelWidth" prop="pcs">  
454 - <el-input disabled v-model="detaForm.pcs" autocomplete="off" size="small" style="width: 300px">  
455 - <template slot="prepend">件&emsp;&emsp;&emsp;数</template>  
456 - </el-input>  
457 - </el-form-item>  
458 - </el-col>  
459 - <el-col :span="8">  
460 - <el-form-item label="" :label-width="formLabelWidth" prop="weight">  
461 - <el-input disabled v-model="detaForm.weight" autocomplete="off" size="small" style="width: 300px">  
462 - <template slot="prepend">重&emsp;&emsp;&emsp;量</template>  
463 - </el-input>  
464 - </el-form-item>  
465 - </el-col>  
466 - <el-col :span="8">  
467 - <el-form-item label="" :label-width="formLabelWidth" prop="feewt">  
468 - <el-input disabled v-model="detaForm.feewt" autocomplete="off" size="small" style="width: 300px">  
469 - <template slot="prepend">计费重量</template>  
470 - </el-input>  
471 - </el-form-item>  
472 - </el-col>  
473 - </el-row>  
474 - <el-row>  
475 - <el-col :span="7">  
476 - <el-form-item label="" :label-width="formLabelWidth" prop="pack">  
477 - <el-input disabled v-model="detaForm.pack" autocomplete="off" size="small" style="width: 300px">  
478 - <template slot="prepend">包&emsp;&emsp;&emsp;装</template>  
479 - </el-input>  
480 - </el-form-item>  
481 - </el-col>  
482 - <el-col :span="8">  
483 - <el-form-item label="" :label-width="formLabelWidth" prop="meas">  
484 - <el-input disabled v-model="detaForm.meas" autocomplete="off" size="small" style="width: 300px">  
485 - <template slot="prepend">尺&emsp;&emsp;&emsp;寸</template>  
486 - </el-input>  
487 - </el-form-item>  
488 - </el-col>  
489 - <el-col :span="8">  
490 - <el-form-item label="" :label-width="formLabelWidth" prop="area">  
491 - <el-input disabled v-model="detaForm.vol" autocomplete="off" size="small" style="width: 300px">  
492 - <template slot="prepend">体&emsp;&emsp;积</template>  
493 - </el-input>  
494 - </el-form-item>  
495 - </el-col>  
496 - </el-row>  
497 - </el-form>  
498 - </el-dialog>  
499 - </el-row> 443 +<!-- <el-row>-->
  444 +<!-- <el-dialog :title="detaMap" :visible.sync="detaDialog" width="70%" >-->
  445 +<!-- <el-form :model="detaForm" :rules="detaRules" ref="detaForm" style="margin-top: 40px;padding-bottom: 30px">-->
  446 +<!-- <el-row>-->
  447 +<!-- <el-col :span="7">-->
  448 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="dest4">-->
  449 +<!-- <el-input disabled v-model="detaForm.dest4" autocomplete="off" size="small" style="width: 300px">-->
  450 +<!-- <template slot="prepend">代理人名称</template>-->
  451 +<!-- </el-input>-->
  452 +<!-- </el-form-item>-->
  453 +<!-- </el-col>-->
  454 +<!-- <el-col :span="8">-->
  455 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="shpcomid">-->
  456 +<!-- <el-input disabled v-model="detaForm.shpcomid" autocomplete="off" size="small" style="width: 300px">-->
  457 +<!-- <template slot="prepend">代理人代码</template>-->
  458 +<!-- </el-input>-->
  459 +<!-- </el-form-item>-->
  460 +<!-- </el-col>-->
  461 +<!-- <el-col :span="8">-->
  462 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="optime">-->
  463 +<!-- <el-input disabled v-model="detaForm.optime" autocomplete="off" size="small" style="width: 300px">-->
  464 +<!-- <template slot="prepend">入库时间</template>-->
  465 +<!-- </el-input>-->
  466 +<!-- </el-form-item>-->
  467 +<!-- </el-col>-->
  468 +<!-- </el-row>-->
  469 +<!-- <el-row>-->
  470 +<!-- <el-col :span="7">-->
  471 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="pcs">-->
  472 +<!-- <el-input disabled v-model="detaForm.pcs" autocomplete="off" size="small" style="width: 300px">-->
  473 +<!-- <template slot="prepend">件&emsp;&emsp;&emsp;数</template>-->
  474 +<!-- </el-input>-->
  475 +<!-- </el-form-item>-->
  476 +<!-- </el-col>-->
  477 +<!-- <el-col :span="8">-->
  478 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="weight">-->
  479 +<!-- <el-input disabled v-model="detaForm.weight" autocomplete="off" size="small" style="width: 300px">-->
  480 +<!-- <template slot="prepend">重&emsp;&emsp;&emsp;量</template>-->
  481 +<!-- </el-input>-->
  482 +<!-- </el-form-item>-->
  483 +<!-- </el-col>-->
  484 +<!-- <el-col :span="8">-->
  485 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="feewt">-->
  486 +<!-- <el-input disabled v-model="detaForm.feewt" autocomplete="off" size="small" style="width: 300px">-->
  487 +<!-- <template slot="prepend">计费重量</template>-->
  488 +<!-- </el-input>-->
  489 +<!-- </el-form-item>-->
  490 +<!-- </el-col>-->
  491 +<!-- </el-row>-->
  492 +<!-- <el-row>-->
  493 +<!-- <el-col :span="7">-->
  494 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="pack">-->
  495 +<!-- <el-input disabled v-model="detaForm.pack" autocomplete="off" size="small" style="width: 300px">-->
  496 +<!-- <template slot="prepend">包&emsp;&emsp;&emsp;装</template>-->
  497 +<!-- </el-input>-->
  498 +<!-- </el-form-item>-->
  499 +<!-- </el-col>-->
  500 +<!-- <el-col :span="8">-->
  501 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="meas">-->
  502 +<!-- <el-input disabled v-model="detaForm.meas" autocomplete="off" size="small" style="width: 300px">-->
  503 +<!-- <template slot="prepend">尺&emsp;&emsp;&emsp;寸</template>-->
  504 +<!-- </el-input>-->
  505 +<!-- </el-form-item>-->
  506 +<!-- </el-col>-->
  507 +<!-- <el-col :span="8">-->
  508 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="area">-->
  509 +<!-- <el-input disabled v-model="detaForm.vol" autocomplete="off" size="small" style="width: 300px">-->
  510 +<!-- <template slot="prepend">体&emsp;&emsp;积</template>-->
  511 +<!-- </el-input>-->
  512 +<!-- </el-form-item>-->
  513 +<!-- </el-col>-->
  514 +<!-- </el-row>-->
  515 +<!-- </el-form>-->
  516 +<!-- </el-dialog>-->
  517 +<!-- </el-row>-->
  518 +<!-- <el-row>-->
  519 +<!-- <el-dialog :title="detaWaybill" :visible.sync="waybillDialog" width="40%" >-->
  520 +<!-- -->
  521 +<!-- </el-dialog>-->
  522 +<!-- </el-row>-->
500 </el-card> 523 </el-card>
501 </el-row> 524 </el-row>
502 </template> 525 </template>
@@ -505,16 +528,56 @@ @@ -505,16 +528,56 @@
505 import { 528 import {
506 selectNewInventroys, 529 selectNewInventroys,
507 delInventroy, 530 delInventroy,
508 - addInventory, 531 + addInventory,batchoutbound,batchchangewaybill,
509 ediInventroy, selectBylocationno,selectBywaybillandFhl,ediNewInventroyByfhl,ediNewInventroyBywaybill, 532 ediInventroy, selectBylocationno,selectBywaybillandFhl,ediNewInventroyByfhl,ediNewInventroyBywaybill,
510 } from '../../api/consigner/station'; 533 } from '../../api/consigner/station';
511 import jsutil from "@/common/js/util"; 534 import jsutil from "@/common/js/util";
512 import {loginedUserInfo} from "../../api/user"; 535 import {loginedUserInfo} from "../../api/user";
  536 + import WaybillQuery from "../nmms_import/WaybillQuery"
  537 +
513 538
514 export default { 539 export default {
515 //name: "inventroy", 540 //name: "inventroy",
516 props:['parentLoId'], 541 props:['parentLoId'],
  542 + // components: {
  543 + // WaybillQuery
  544 + // },
517 data() { 545 data() {
  546 + var checkInputArea = (rule, value, callback) => {
  547 + let err = {
  548 + name:'',
  549 + message:''
  550 + }
  551 + let _this = this
  552 + let tempVol = 0
  553 + if (!value) {
  554 + err = new Error('体积信息必填')
  555 + return callback(err);
  556 + }
  557 + setTimeout(() => {
  558 + value = value.replaceAll('*','x')
  559 + var lineStr = value.replace('\r').split('\n')
  560 + lineStr.forEach(((v,index) => {
  561 + // eslint-disable-next-line no-useless-escape
  562 + var pattern = /^[0-9\.]+[xX][0-9\.]+[xX][0-9\.]+[xX][0-9\.]+$/;
  563 + if(!pattern.test(v)){
  564 + err = new Error('行'+(index+1)+'的值:'+v+'的体积格式输入错误,格式为1x1x1x1支持小数点')
  565 + return callback(err);
  566 + }else {
  567 + const volV = this.multiply(v)
  568 + tempVol += volV
  569 + }
  570 + }))
  571 +
  572 + // console.log(err.name + ' '+ err.message)
  573 + callback();
  574 + if (err && err.message===''){
  575 + _this.addForm.goodsvol = (tempVol/1000000).toFixed(2)
  576 + _this.volAreatextMerge(lineStr)
  577 + }
  578 +
  579 + }, 200);
  580 + };
518 return { 581 return {
519 pickerOptions: { 582 pickerOptions: {
520 shortcuts: [{ 583 shortcuts: [{
@@ -543,7 +606,6 @@ @@ -543,7 +606,6 @@
543 } 606 }
544 }] 607 }]
545 }, 608 },
546 -  
547 queryInfo: { 609 queryInfo: {
548 waybill:'', 610 waybill:'',
549 billfhl:'', 611 billfhl:'',
@@ -600,7 +662,10 @@ @@ -600,7 +662,10 @@
600 remark4:'', 662 remark4:'',
601 remark5:'', 663 remark5:'',
602 newwaybill:'', 664 newwaybill:'',
603 - newfhl:'' 665 + newfhl:'',
  666 + batchpcs:'',
  667 + batchweight:'',
  668 + batchgoodssize:'',
604 }, 669 },
605 rules: { 670 rules: {
606 userName: [ 671 userName: [
@@ -707,7 +772,11 @@ @@ -707,7 +772,11 @@
707 fhlForm:{ 772 fhlForm:{
708 billfhl:'', 773 billfhl:'',
709 }, 774 },
710 - fhlRules:{}, 775 + fhlRules:{
  776 + billfhl: [
  777 + { required: true, message: '必填', trigger: 'blur' },
  778 + ],
  779 + },
711 //更改主单号 780 //更改主单号
712 /* 批量选中的列表 */ 781 /* 批量选中的列表 */
713 sels: [], 782 sels: [],
@@ -716,7 +785,45 @@ @@ -716,7 +785,45 @@
716 fwbForm:{ 785 fwbForm:{
717 waybill:'', 786 waybill:'',
718 }, 787 },
719 - fwbRules:{}, 788 + fwbRules:{
  789 + },
  790 + //出库
  791 + outDialog: false,
  792 + detaOut:'批量出库',
  793 + outForm:{
  794 + batchpcs:'',
  795 + batchweight:'',
  796 + batchgoodssize:'',
  797 + },
  798 + outRules:{
  799 + batchgoodssize:[
  800 + { required: true, message: '尺寸', trigger: 'blur' },
  801 + { validator: checkInputArea, trigger: 'blur' }
  802 + // { pattern: /^[0-9\.x]+$/gm, message: '体积信息只能输入数字和(.)点符号与x小写字母' }
  803 + ],
  804 + batchpcs: [
  805 + { required: true, message: '必填', trigger: 'blur' },
  806 + { type:"number", message: ''}
  807 + ],
  808 + batchweight: [
  809 + { required: true, message: '必填', trigger: 'blur' },
  810 + { type:"number", message: ''}
  811 + ],
  812 + },
  813 + //批量改单
  814 + changeDialog: false,
  815 + detaChange:'改单',
  816 + changeForm:{
  817 + newwaybill:'',
  818 + },
  819 + changeRules:{
  820 + newwaybill: [
  821 + { required: true, message: '必填', trigger: 'blur' },
  822 + ],
  823 + },
  824 + //明细
  825 + waybillDialog: false,
  826 + detaWaybill:'更改分单号',
720 } 827 }
721 }, 828 },
722 computed:{ 829 computed:{
@@ -785,6 +892,68 @@ @@ -785,6 +892,68 @@
785 }).catch(() => { 892 }).catch(() => {
786 }) 893 })
787 }, 894 },
  895 + //出库
  896 + outBound(row) {
  897 + this.outDialog = true;
  898 + this.addForm=row;
  899 + },
  900 + outEdit() {
  901 + const _this=this;
  902 + // 进行表单的预验证
  903 + _this.$refs.outForm.validate(valid => {
  904 + // 未通过，表单预校验
  905 + if (!valid) return
  906 + this.addForm.batchpcs=this.outForm.batchpcs;
  907 + this.addForm.batchweight=this.outForm.batchweight;
  908 + this.addForm.batchgoodssize=this.outForm.batchgoodssize;
  909 + batchoutbound(this.addForm).then((response) => {
  910 + // console.log(row)
  911 + const res = response.data
  912 + // console.log(res)
  913 + if (res.code != '200') {
  914 + return this.$message.error(res.msg)
  915 + }
  916 + this.$message.success(res.msg)
  917 + // 隐藏对话框
  918 + this.outDialog = false
  919 + // 刷新列表
  920 + this.getList()
  921 + }).catch(error => {
  922 + this.$message.error(error.toString())
  923 +
  924 + })
  925 + })
  926 + },
  927 + //批量改单
  928 + changeOrder(row) {
  929 + this.changeDialog = true;
  930 + this.addForm=row;
  931 + },
  932 + changeEdit() {
  933 + const _this=this;
  934 + // 进行表单的预验证
  935 + _this.$refs.changeForm.validate(valid => {
  936 + // 未通过，表单预校验
  937 + if (!valid) return
  938 + this.addForm.newwaybill=this.changeForm.newwaybill;
  939 + batchchangewaybill(this.addForm).then((response) => {
  940 + // console.log(row)
  941 + const res = response.data
  942 + // console.log(res)
  943 + if (res.code != '200') {
  944 + return this.$message.error(res.msg)
  945 + }
  946 + this.$message.success(res.msg)
  947 + // 隐藏对话框
  948 + this.changeDialog = false
  949 + // 刷新列表
  950 + this.getList()
  951 + }).catch(error => {
  952 + this.$message.error(error.toString())
  953 +
  954 + })
  955 + })
  956 + },
788 //打开更改分单号 957 //打开更改分单号
789 changeFhl(row) { 958 changeFhl(row) {
790 this.fhlDialog = true; 959 this.fhlDialog = true;
@@ -816,23 +985,35 @@ @@ -816,23 +985,35 @@
816 }) 985 })
817 }, 986 },
818 //查询货物明细 987 //查询货物明细
  988 + // queryDeta(row) {
  989 + // const _this = this
  990 + // this.detaDialog = true;
  991 + // // console.log(row);
  992 + // selectBywaybillandFhl({waybill:row.waybill,billfhl:row.billfhl}).then((response) => {
  993 + // const res = response.data
  994 + // // console.log(response.data)
  995 + // if (res.code !== '200') {
  996 + // return _this.$message.error('获取货物明细，失败！')
  997 + // }
  998 + // // 获取表单数据
  999 + // _this.detaForm = res.data
  1000 + // _this.$message.success('获取货物明细，成功！')
  1001 + // }).catch(error => {
  1002 + // // 关闭加载
  1003 + // _this.$message.error(error.toString())
  1004 + // })
  1005 + // },
819 queryDeta(row) { 1006 queryDeta(row) {
820 - const _this = this  
821 - this.detaDialog = true;  
822 - // console.log(row);  
823 - selectBywaybillandFhl({waybill:row.waybill,billfhl:row.billfhl}).then((response) => {  
824 - const res = response.data  
825 - // console.log(response.data)  
826 - if (res.code !== '200') {  
827 - return _this.$message.error('获取货物明细，失败！') 1007 + // this.form=row
  1008 + // this.form.awba=this.form.waybill
  1009 + // console.log("queryinfo---->"+this.form.awba)
  1010 + // this.$refs.WaybillQuery.getList(this.form)
  1011 + this.$router.push(
  1012 + {
  1013 + path:'WaybillQuery',
  1014 + query:row
828 } 1015 }
829 - // 获取表单数据  
830 - _this.detaForm = res.data  
831 - _this.$message.success('获取货物明细，成功！')  
832 - }).catch(error => {  
833 - // 关闭加载  
834 - _this.$message.error(error.toString())  
835 - }) 1016 + )
836 }, 1017 },
837 handleSizeChange(val) { 1018 handleSizeChange(val) {
838 this.queryInfo.pageSize = val 1019 this.queryInfo.pageSize = val
@@ -160,6 +160,13 @@ @@ -160,6 +160,13 @@
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 <el-col :span="6"> 162 <el-col :span="6">
  163 + <el-form-item prop="feewt">
  164 + <el-input readonly v-model="ruleForm.feewt" style="width: 200px">
  165 + <template slot="prepend">计费重量</template>
  166 + </el-input>
  167 + </el-form-item>
  168 + </el-col>
  169 + <el-col :span="6">
163 <el-form-item prop="goodsname"> 170 <el-form-item prop="goodsname">
164 <el-input readonly v-model="ruleForm.goodsname" style="width: 200px"> 171 <el-input readonly v-model="ruleForm.goodsname" style="width: 200px">
165 <template slot="prepend">货物描述</template> 172 <template slot="prepend">货物描述</template>
@@ -167,6 +174,52 @@ @@ -167,6 +174,52 @@
167 </el-form-item> 174 </el-form-item>
168 </el-col> 175 </el-col>
169 </el-row> 176 </el-row>
  177 + <el-row class="flightInfo">
  178 + <el-col :span="6">
  179 + <el-form-item prop="pack">
  180 + <el-input readonly v-model="ruleForm.pack" style="width: 200px">
  181 + <template slot="prepend">包&emsp;&emsp;装</template>
  182 + </el-input>
  183 + </el-form-item>
  184 + </el-col>
  185 + <el-col :span="6">
  186 + <el-form-item prop="meas">
  187 + <el-input readonly v-model="ruleForm.meas" style="width: 200px">
  188 + <template slot="prepend">尺&emsp;&emsp;寸</template>
  189 + </el-input>
  190 + </el-form-item>
  191 + </el-col>
  192 + <el-col :span="6">
  193 + <el-form-item prop="vol">
  194 + <el-input readonly v-model="ruleForm.vol" style="width: 200px">
  195 + <template slot="prepend">体&emsp;&emsp;积</template>
  196 + </el-input>
  197 + </el-form-item>
  198 + </el-col>
  199 + </el-row>
  200 + <el-row class="flightInfo">
  201 + <el-col :span="6">
  202 + <el-form-item prop="dest4">
  203 + <el-input readonly v-model="ruleForm.dest4" style="width: 200px">
  204 + <template slot="prepend">代理人名称</template>
  205 + </el-input>
  206 + </el-form-item>
  207 + </el-col>
  208 + <el-col :span="6">
  209 + <el-form-item prop="shpcomid">
  210 + <el-input readonly v-model="ruleForm.shpcomid" style="width: 200px">
  211 + <template slot="prepend">代理人代码</template>
  212 + </el-input>
  213 + </el-form-item>
  214 + </el-col>
  215 + <el-col :span="6">
  216 + <el-form-item prop="optime">
  217 + <el-input readonly v-model="ruleForm.optime" style="width: 250px">
  218 + <template slot="prepend">入库时间</template>
  219 + </el-input>
  220 + </el-form-item>
  221 + </el-col>
  222 + </el-row>
170 <!--发货人信息部分--> 223 <!--发货人信息部分-->
171 <el-row class="flightInfo"> 224 <el-row class="flightInfo">
172 <el-col :span="24"> 225 <el-col :span="24">
@@ -242,7 +295,6 @@ @@ -242,7 +295,6 @@
242 </el-row> 295 </el-row>
243 </el-form> 296 </el-form>
244 </el-dialog> 297 </el-dialog>
245 -  
246 </el-main> 298 </el-main>
247 </el-container> 299 </el-container>
248 </template> 300 </template>
@@ -252,6 +304,9 @@ @@ -252,6 +304,9 @@
252 304
253 export default { 305 export default {
254 name: "WaybillQuery", 306 name: "WaybillQuery",
  307 + // props: [
  308 + // 'forms'
  309 + // ],
255 data(){ 310 data(){
256 return{ 311 return{
257 form:{ 312 form:{
@@ -277,6 +332,13 @@ @@ -277,6 +332,13 @@
277 cnsnaddress:'', 332 cnsnaddress:'',
278 cnsntel:'', 333 cnsntel:'',
279 cnscountyr:'', 334 cnscountyr:'',
  335 + dest4:'',
  336 + shpcomid:'',
  337 + optime:'',
  338 + feewt:'',
  339 + pack:'',
  340 + meas:'',
  341 + vol:'',
280 }, 342 },
281 rules:{ 343 rules:{
282 344
@@ -301,7 +363,6 @@ @@ -301,7 +363,6 @@
301 this.currentPage=val; 363 this.currentPage=val;
302 this.getList(); 364 this.getList();
303 }, 365 },
304 - // 获取消息标签列表  
305 getList() { 366 getList() {
306 const _this = this 367 const _this = this
307 this.tableloading = true; 368 this.tableloading = true;
@@ -333,7 +394,12 @@ @@ -333,7 +394,12 @@
333 this.ruleForm.stockno=""; 394 this.ruleForm.stockno="";
334 } 395 }
335 }, 396 },
336 - } 397 + },
  398 + activated() {
  399 + this.form.awba=this.$route.query.waybill
  400 + // console.log(this.$route.query.waybill)
  401 + this.getList();
  402 + },
337 } 403 }
338 </script> 404 </script>
339 405