-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
-
-
-
-
-
-
- 收件人
-
- 收件地址薄
-
-
-
-
-
-
-
-
-
-
-
- 货物信息
-
-
-
-
-
-
- 收费信息
-
-
-
-
-
@@ -519,6 +422,8 @@ import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue'
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@@ -570,6 +475,8 @@ components: {
GoodsPicker,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
+ EmisUserSimplePicker2,
+ EmisUserSimplePicker3,
// CustomerPicker0,
// CustomerPicker1,
// CustomerPicker2,
@@ -594,12 +501,12 @@ dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_calc_fee_type','emis_print_type'],
data() {
return {
+ activeNames:['1','2','3','4'],
billCode:null,
emisWaybillOptions: [],
addressType:null,
// 遮罩层
loading: true,
-
// 表单参数
form: {},
timer:null,
@@ -816,6 +723,9 @@ created() {
this.initData();
},
methods: {
+ openCollapse(index){
+
+ },
initData() {
this.reset();
// this.timer=setInterval(this.showLocalTime, 1000);
@@ -830,8 +740,30 @@ methods: {
this.loading = true;
getWaybillDetail(this.billCode).then(response => {
this.form = response.data;
+ this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
this.loading = false;
});
+ }else{
+ let cargo={
+ "goodsCode": "货物代码:eg 123",
+ "goodsName": "货物名称",
+ "cargoQty": "货物数量: 10",
+ "unit": "件",
+ "price": "1.2",
+ "currency": "CNY",
+ "nationArea": "中国",
+ "taxNo": "行邮税号",
+ "hscode": "海关编码",
+ "brand": "品牌",
+ "material": "材质",
+ "purpose": "用途",
+ "ingredients": "成分",
+ "goodsModel": "规格",
+ "orderNum": "序号",
+ "supplier": "供应商",
+ "isSave": "是否保存 1-保存"
+ };
+ this.form.cargoList.push(cargo);
}
},
@@ -884,6 +816,7 @@ methods: {
paymentType: null,
calcFeeType: '1',
custNo: null,
+ productTypeSelArr: null,
transLine: null,
productType: null,
customsClear: null,
@@ -935,7 +868,12 @@ methods: {
this.resetForm("form");
},
onTransLineChange(item){
- this.form.meterType = item.meterRate;
+ // this.form.meterType = item.meterRate;
+ },
+ onProductChange(item){
+ console.log(item);
+ this.form.transLine=item[0];
+ this.form.productType=item[1];
},
/** 提交按钮 */
submitForm() {
@@ -1008,14 +946,15 @@ methods: {
});
}
},
+ // 计算体积
calcVolume(){
- // 计算体积
if(this.form.length && this.form.width && this.form.height){
let totalVolume=parseFloat(this.form.length)*parseFloat(this.form.width)*parseFloat(this.form.height);
this.form.totalVolume = totalVolume/1000000;
this.calcVolumeWeightByTotalVolume();
}
},
+ // 计算体积重量
calcVolumeWeightByTotalVolume(){
let postData={
productType: this.form.productType,
@@ -1023,28 +962,26 @@ methods: {
}
calcVolumeWeight(postData).then(response => {
- console.log(response);
this.form.volumeWeight = response.data.volumeWeight;
});
},
+ // 计算计算重量
calcSettlementWeightByRemote(){
-
if(this.form.billWeight
&& this.form.totalVolume
&& this.form.productType
){
let postData={
productType: this.form.productType,
- totalVolume: this.form.totalVolume,
+ volumeWeight: this.form.volumeWeight,
billWeight: this.form.billWeight,
}
// console.log(postData);
calcSetteldWeight(postData).then(response => {
console.log(response);
- // this.form.volumeWeight = response.data.volumeWeight;
this.form.settlementWeight = response.data.settlementWeight;
- // this.form.feeWeight = this.form.settlementWeight ;
+ this.form.feeWeight = this.form.settlementWeight ;
});
}
@@ -1150,7 +1087,7 @@ methods: {
.form-row-group-panel{
margin-right: 5px;
padding: 8px;
- border-right: 1px solid #ededed;
+ // border-right: 1px solid #ededed;
}
@@ -1170,5 +1107,46 @@ methods: {
}
}
+.el-collapse {
+ border-top: none!important;
+ border-bottom: none!important;
+}
+
+.el-table .el-table__cell:first-child .cell {
+ padding: 0px;
+}
+
+.el-table .cell {
+ padding: 0px;
+}
+
+.cargoList{
+ .el-input__inner {
+ height: 28px;
+ line-height: 28px;
+ border: none;
+ background: #ffffcd;
+ font-size: 10px;
+ padding: 0px;
+ text-align: center;
+ }
+}
+
+ .el-collapse-item__content {
+ padding-bottom: 0px;
+ }
+ .el-collapse-item__header{
+ pointer-events: none;
+ }
+
+ .el-collapse-item__arrow {
+ pointer-events: auto;
+ }
+
+
+
+
+
+
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index c6433808..578399bb 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -1313,7 +1313,9 @@
- {{scope.row.billCode}}
+
+ {{ scope.row.billCode }}
+
@@ -1470,32 +1472,8 @@
-->
-
-
- 修改
-
-
-
-
-
-