diff --git a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
index d2d9ed5f..d8a03295 100644
--- a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
+++ b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
@@ -2,14 +2,19 @@
   <div >
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <el-col :span="12">
+          <el-col :span="18" style="padding-right:8px">
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="运输批次" prop="batchNo">
                   <EmisTmsSiteBatchPicker v-model="form.batchNo" @onChange="onSelecTmsBatch" :disabled="form.id!=null"></EmisTmsSiteBatchPicker>
                 </el-form-item>
               </el-col>
-              <el-col :span="14">
+              <el-col :span="12">
+                <el-form-item :label="$t('供应商:')" prop="supplierCode">
+                      <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode" @onChange="onSupplierSelect" ></EmisSupplierPicker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
                   <el-form-item label="成本时间" prop="tradeDate" >
                     <el-date-picker
                     style="width:100%"
@@ -21,7 +26,7 @@
                     </el-date-picker>
                   </el-form-item>
               </el-col>
-              <el-col :span="10">
+              <el-col :span="12">
                 <el-form-item label="账期" prop="billMonth">
                   <el-date-picker  style="width:100%" v-model="form.billMonth" type="month" placeholder="账期" value-format="yyyy-MM"></el-date-picker>
                 </el-form-item>
@@ -61,6 +66,11 @@
                                     <span style="font-weight:600;color:red"><dict-tag :options="dict.type.emis_cost_fee_type" :value="scope.row.feeType"/></span>
                                   </template>
                                 </el-table-column>
+                                <el-table-column prop="price" :label="$t('单价')" align="center" min-width="80">
+                                  <template slot-scope="scope">
+                                    <el-input-number  v-model="scope.row.price"  placeholder="" size="mini" :min="0.00" :controls="false" :precision="2" @blur="(val)=>handleCalcFeeItem(scope.row)" @keyup.enter.native="handleCalcFeeItem(scope.row)"></el-input-number>
+                                  </template>
+                                </el-table-column>
                                 <el-table-column prop="fee" :label="$t('费用')" align="center" min-width="80">
                                   <template slot-scope="scope">
                                     <el-input-number  v-model="scope.row.fee"  placeholder="" size="mini" :min="0.00" :controls="false" :precision="2" ></el-input-number>
@@ -68,7 +78,7 @@
                                 </el-table-column>
                                 <el-table-column prop="currency"  :label="$t('币种')"  align="center" width="150" >
                                   <template slot-scope="scope">
-                                    <el-select v-model="scope.row.currency" size="mini" placeholder="" >
+                                    <el-select v-model="scope.row.currency" size="mini" placeholder="" style="width:100%">
                                       <el-option
                                         v-for="dict in dict.type.sys_currency_type.filter(item=> (item.value=='CNY' || item.value=='USD') )"
                                         :key="dict.value"
@@ -78,55 +88,88 @@
                                     </el-select>
                                   </template>
                                 </el-table-column>
+                                <el-table-column  prop="remark" :label="$t('描述')"  align="center" min-width="50">
+                                  <template slot-scope="scope">
+                                    <el-input v-model="scope.row.remark" size="mini" placeholder=""></el-input>
+                                  </template>
+                                </el-table-column>
+                                <el-table-column :label="$t('操作')" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                                </el-table-column>
                           </el-table>
+                          <div>
+                            <el-popover
+                                trigger="click"
+                                ref="popoverFeeRef"
+                                placement="top"
+                                :width="400"
+                                effect="light"
+                                :show-arrow="false"
+                              >
+                                <CostFeeItemForm :triggerCount="triggerCount" :feeList="this.form.feeItemList" @on-changed="onFeeItemChange" @on-cancel="onFeeItemChange"></CostfeeItemForm>
+                                <el-button
+                                     slot="reference"
+                                      style="padding: 0px;font-size: 12px;"
+                                      size="mini"
+                                      type="text"
+                                      icon="el-icon-plus"
+                                      @click="handleAddFee"
+                                    >{{ $t('增加自定义费用') }}</el-button>
+                              </el-popover>
+                          </div>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="6" style="border-left: 1px solid #dfdfdf;padding-left: 2px;">
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+
               <el-col :span="24">
-                <el-form-item :label="$t('供应商')" prop="supplierCode">
-                      <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode" disabled  ></EmisSupplierPicker>
+                <el-form-item label="承运重量:" prop="realTotalWeight">
+                  <!-- <el-input-number  v-model="form.realTotalWeight"  style="width:100%"  placeholder="承运重量" :min="1" :controls="false" :precision="2" disabled></el-input-number> -->
+                  {{ form.realTotalWeight }} (kg)
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="承运重量" prop="realTotalWeight">
-                  <el-input-number  v-model="form.realTotalWeight"  style="width:100%"  placeholder="承运重量" :min="1" :controls="false" :precision="2" disabled>
-                  </el-input-number>
+              <el-col :span="24">
+                <el-form-item label="包裹数:" prop="realPieceNumber">
+                  <!-- <el-input-number  v-model="form.realPieceNumber"  style="width:100%"  placeholder="包裹数" :min="1" :controls="false" :precision="0" disabled></el-input-number> -->
+                  {{ form.realPieceNumber }} (个)
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="包裹数" prop="realPieceNumber">
-                  <el-input-number  v-model="form.realPieceNumber"  style="width:100%"  placeholder="包裹数" :min="1" :controls="false" :precision="0" disabled></el-input-number>
+              <el-col :span="24">
+                <el-form-item label="发件地:" prop="sendPlace">
+                  {{ form.sendPlace }}
+                  <!-- <el-input v-model="form.sendPlace" placeholder="请输入发件地" disabled/> -->
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="发件地" prop="sendPlace">
-                  <el-input v-model="form.sendPlace" placeholder="请输入发件地" disabled/>
+              <el-col :span="24">
+                <el-form-item label="目的地:" prop="destPlace">
+                  {{ form.destPlace }}
+                  <!-- <el-input v-model="form.destPlace" placeholder="请输入目的地" disabled/> -->
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="目的地" prop="destPlace">
-                  <el-input v-model="form.destPlace" placeholder="请输入目的地" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="运输方式" prop="transType">
-                  <el-select clearable v-model="form.transType" placeholder="请选择" style="width:100%" disabled>
+              <el-col :span="24">
+                <el-form-item label="运输方式:" prop="transType">
+                  <!-- <el-select clearable v-model="form.transType" placeholder="请选择" style="width:100%" disabled>
                     <el-option
                       v-for="dict in dict.type.emis_biz_shipping_method"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
                     ></el-option>
-                  </el-select>
+                  </el-select> -->
+                  <dict-tag :options="dict.type.emis_biz_shipping_method" :value="form.transType"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="运输号" prop="transSignNo">
-                  <el-input v-model="form.transSignNo" placeholder="提单号/车次号/船次号/单号" disabled/>
+              <el-col :span="24">
+                <el-form-item label="运输号:" prop="transSignNo">
+                  {{ form.transSignNo }}
+                  <!-- <el-input v-model="form.transSignNo" placeholder="提单号/车次号/船次号/单号" disabled/> -->
                 </el-form-item>
               </el-col>
 
@@ -234,7 +277,7 @@
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
+                                    @click="()=>deleteRelItem(scope.row)">&#xe7ae;</span>
                                   </template>
                             </el-table-column>
 
@@ -288,18 +331,20 @@ import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
 
 import EmisTmsSiteBatchPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchPicker';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
+import CostFeeItemForm from '@/views/emis/emisTmsCostFee/CostFeeItemForm.vue';
 
 export default {
-  name: "emisTmsCostFeeForm",
+  name: "EmisTmsCostFeeForm",
   props:{
     id:{
         type:Number
     }
   },
-  components: { EmisTmsSiteBatchPicker,EmisSupplierPicker },
+  components: { EmisTmsSiteBatchPicker,EmisSupplierPicker,CostFeeItemForm },
   dicts: ['emis_cost_fee_type','emis_supplier_name','emis_cost_split_type','emis_biz_shipping_method','emis_payment_type','emis_trans_feeitem_rel','sys_currency_type'],
   data() {
     return {
+      triggerCount:0,
       emisTmsCostFeeOptions: [],
       // 遮罩层
       loading: true,
@@ -341,14 +386,47 @@ export default {
   },
 
   methods: {
+    handleAddFee(){
+      this.triggerCount++;
+    },
+    onFeeItemChange(item){
+      this.$refs.popoverFeeRef.doClose();
+      if(item!=null){
+        let newItem=Object.assign({},item)
+        if(!this.form.feeItemList){
+          this.form.feeItemList=[];
+        }
+        this.form.feeItemList.push(newItem);
+      }
+    },
+    deleteFeeItem(row){
+      this.$confirm('确定删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+        let newList = this.form.feeItemList.filter(item => item.feeType !== row.feeType);
+        this.form.feeItemList=newList;
+      }).catch(() => {
+      })
+    },
+    deleteRelItem(row){
+      this.$confirm('确定删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+        let newList = this.form.billRelList.filter(item => item.billCode !== row.billCode);
+        this.form.billRelList=newList;
+      }).catch(() => {
+      })
+    },
     onSupplierSelect(item){
       console.log("==onSupplierSelect===>",item);
       if(!item){
-        this.form.supplierCode=null;
         this.form.supplierName=null;
         return;
       }
-      this.form.supplierCode=item.code;
       this.form.supplierName=item.name;
     },
     async addBillToApply(){
@@ -430,7 +508,8 @@ export default {
                       if(feeTypeArr.includes(itemType.value)){
                         let feeItem={
                           feeType:itemType.value,
-                          fee:0,
+                          price:null,
+                          fee:null,
                           currency:'CNY'
                         }
                         this.form.feeItemList.push(feeItem);
@@ -443,6 +522,13 @@ export default {
 
           this.loading = false;
     },
+    async handleCalcFeeItem(row){
+        if(row!=null ){
+            if(row.price!=null && row.price>0.0){
+              row.fee = Number(this.form.realTotalWeight*row.price).toFixed(2);
+            }
+        }
+    },
     initData() {
         if(this.id !=null) {
           this.loading = true;
@@ -545,3 +631,87 @@ export default {
   }
 };
 </script>
+
+
+<style lang="scss">
+
+.el-form-item__label {
+    color: #000;
+}
+
+.el-input-group__append {
+    padding: 0 4px;
+}
+
+.el-row{
+      display:flex;
+      flex-wrap: wrap;
+      // padding-right: 10px;
+ }
+
+.el-form-item__label {
+  font-size: 12px!important;
+}
+
+
+ .platform-auto-complete {
+  .el-autocomplete-suggestion__wrap {
+    padding: 5px 0;
+    ul li {
+      pointer-events: none; // 阻止可点击事件
+      .default {
+        text-align: center;
+        color: #999;
+      }
+      &:hover {
+        background-color: #fff;
+      }
+    }
+  }
+}
+
+.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-input-number--mini {
+  //   width: 100%;
+  //   line-height: 26px;
+  // }
+
+  .el-input-number {
+    width: 100%!important;
+  }
+
+  .el-input-number.is-without-controls .el-input__inner {
+      height: 28px;
+      line-height: 28px;
+      border: none;
+      background: #ffffcd;
+      font-size: 10px;
+      padding: 0px;
+      text-align: center;
+  }
+}
+
+</style>