md

src/views/emis/EmisBaseTools/TransProductCasPicker.vue

@@ -95,7 +95,7 @@ export default {
       },
       svalue(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.$emit("input", this.svalue);
+
         }
       },
       countryCode(newVal) {
@@ -141,6 +141,8 @@ export default {
     },
     handleChange(value) {
       console.log(value);
+      this.$emit("input", this.svalue);
+      this.$emit("onChange", this.svalue);
     },
   },
 };

src/views/emis/emisWaybill/emisWaybillRecord.vue

@@ -26,7 +26,7 @@
             </el-col> -->
             <el-col :span="6">
               <el-form-item label="产品类型" prop="productType">
-                <TransProductCasPicker v-model="form.productType" :countryCode="form.reciever.country" ></TransProductCasPicker>
+                <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
                 <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
               </el-form-item>
             </el-col>
@@ -599,7 +599,6 @@ data() {
     addressType:null,
     // 遮罩层
     loading: true,
-
     // 表单参数
     form: {},
     timer:null,
@@ -830,6 +829,7 @@ 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;
         });
       }
@@ -884,6 +884,7 @@ methods: {
       paymentType: null,
       calcFeeType: '1',
       custNo:  null,
+      productTypeSelArr: null,
       transLine:  null,
       productType: null,
       customsClear: null,
@@ -935,7 +936,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 +1014,15 @@ methods: {
         });
     }
   },
-  calcVolume(){
   // 计算体积
+  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 +1030,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 ;
         });
       }
 

src/views/emis/emisWaybill/waybillList.vue

@@ -1313,7 +1313,9 @@
       <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.billCode}}</div>
+            <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+              <span>{{ scope.row.billCode }}</span>
+            </router-link>
          </template>
       </el-table-column>
       <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
@@ -1470,32 +1472,8 @@
       <el-table-column :label="$t('时区偏差')" align="center" prop="timezoneOffset" min-width="100" />
       <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisWaybill:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisWaybill:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
     </XdTable>
 
-    <!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisWaybillForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillForm>
-    </el-dialog> -->
-
-
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
         <emisWaybillView :id="id" ></EmisWaybillView>