diff --git a/src/views/emis/emisQuotePrice/index.vue b/src/views/emis/emisQuotePrice/index.vue
index 19ffbdd3..249cb43f 100644
--- a/src/views/emis/emisQuotePrice/index.vue
+++ b/src/views/emis/emisQuotePrice/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
-      <el-form-item label="" prop="quoteName">
+      <el-form-item label="" prop="quoteName" span="8">
         <el-input
           v-model="queryParams.quoteName"
           placeholder="报价名称"
@@ -10,196 +10,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="quoteCode">
-        <el-input
-          v-model="queryParams.quoteCode"
-          placeholder="报价编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSiteCode">
-        <el-input
-          v-model="queryParams.useSiteCode"
-          placeholder="使用站点代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="useSite">
-        <el-input
-          v-model="queryParams.useSite"
-          placeholder="使用站点名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transLineCode">
-        <el-input
-          v-model="queryParams.transLineCode"
-          placeholder="所属线路代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transLine">
-        <el-input
-          v-model="queryParams.transLine"
-          placeholder="所属线路名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="feeType">
-        <el-input
-          v-model="queryParams.feeType"
-          placeholder="费用类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prodCode">
-        <el-input
-          v-model="queryParams.prodCode"
-          placeholder="产品类型代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prodName">
-        <el-input
-          v-model="queryParams.prodName"
-          placeholder="产品类型名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="soonPieceType">
-        <el-input
-          v-model="queryParams.soonPieceType"
-          placeholder="soon_piece_type"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="recPayType">
-        <el-input
-          v-model="queryParams.recPayType"
-          placeholder="录入付款类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billType">
-        <el-input
-          v-model="queryParams.billType"
-          placeholder="计费类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="otherType1">
-        <el-input
-          v-model="queryParams.otherType1"
-          placeholder="其他类型1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="otherType2">
-        <el-input
-          v-model="queryParams.otherType2"
-          placeholder="其他类型2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="carryType">
-        <el-input
-          v-model="queryParams.carryType"
-          placeholder="取重方式"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-input
-          v-model="queryParams.status"
-          placeholder="启用状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispAreaSite">
-        <el-input
-          v-model="queryParams.dispAreaSite"
-          placeholder="派件区域站点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispAreaName">
-        <el-input
-          v-model="queryParams.dispAreaName"
-          placeholder="派件区域名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendAreaName">
-        <el-input
-          v-model="queryParams.sendAreaName"
-          placeholder="寄件区域名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendAreaSite">
-        <el-input
-          v-model="queryParams.sendAreaSite"
-          placeholder="寄件区域站点列表"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="carriesNumber">
-        <el-input
-          v-model="queryParams.carriesNumber"
-          placeholder="carries_number"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="discardsNumber">
-        <el-input
-          v-model="queryParams.discardsNumber"
-          placeholder="discards_number"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="leastPrice">
-        <el-input
-          v-model="queryParams.leastPrice"
-          placeholder="最低价格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="priceType">
-        <el-input
-          v-model="queryParams.priceType"
-          placeholder="价格取值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="" prop="startDate">
         <el-date-picker clearable
           v-model="queryParams.startDate"
           type="date"
           value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择开始日期">
+          placeholder="报价开始日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="" prop="endDate">
@@ -207,32 +23,36 @@
           v-model="queryParams.endDate"
           type="date"
           value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择结束日期">
+          placeholder="报价结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="priorityLevel">
+      <el-form-item label="" prop="sendAreaSite">
+        <el-select v-model="queryParams.sendAreaSite" placeholder="寄件区域网点" clearable>
+          <el-option
+            v-for="dict in sendAreaSiteIdsOptions"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.label"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="" prop="dispAreaSite">
         <el-input
-          v-model="queryParams.priorityLevel"
-          placeholder="优先级"
+          v-model="queryParams.dispAreaSite"
+          placeholder="派件区域"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          placeholder="删除标志（0代表存在"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="" prop="status">
+        <el-select v-model="queryParams.status" placeholder="报价状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -294,66 +114,27 @@
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
       </el-table-column>
-       <!--
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
       <el-table-column label="报价名称" align="center" prop="quoteName" min-width="100" />
-      <el-table-column label="报价编码" align="center" prop="quoteCode" min-width="100" />
-      <el-table-column label="使用站点代码" align="center" prop="useSiteCode" min-width="100" />
-      <el-table-column label="使用站点名称" align="center" prop="useSite" min-width="100" />
-      <el-table-column label="所属线路代码" align="center" prop="transLineCode" min-width="100" />
-      <el-table-column label="所属线路名称" align="center" prop="transLine" min-width="100" />
-      <el-table-column label="费用类型" align="center" prop="feeType" min-width="100" />
-      <el-table-column label="产品类型代码" align="center" prop="prodCode" min-width="100" />
-      <el-table-column label="产品类型名称" align="center" prop="prodName" min-width="100" />
-      <el-table-column label="soon_piece_type" align="center" prop="soonPieceType" min-width="100" />
-      <el-table-column label="录入付款类型" align="center" prop="recPayType" min-width="100" />
-      <el-table-column label="计费类型" align="center" prop="billType" min-width="100" />
-      <el-table-column label="其他类型1" align="center" prop="otherType1" min-width="100" />
-      <el-table-column label="其他类型2" align="center" prop="otherType2" min-width="100" />
+      <el-table-column label="费用名称" align="center" prop="quoteCode" min-width="100" />
+      <el-table-column label="网点名称" align="center" prop="useSite" min-width="100" />
+      <el-table-column label="所属线路" align="center" prop="transLine" min-width="100" />
       <el-table-column label="取重方式" align="center" prop="carryType" min-width="100" />
-      <el-table-column label="启用状态" align="center" prop="status" min-width="100" />
-      <el-table-column label="派件区域站点" align="center" prop="dispAreaSite" min-width="100" />
-      <el-table-column label="派件区域名称" align="center" prop="dispAreaName" min-width="100" />
-      <el-table-column label="寄件区域名称" align="center" prop="sendAreaName" min-width="100" />
-      <el-table-column label="寄件区域站点列表" align="center" prop="sendAreaSite" min-width="100" />
-      <el-table-column label="carries_number" align="center" prop="carriesNumber" min-width="100" />
-      <el-table-column label="discards_number" align="center" prop="discardsNumber" min-width="100" />
       <el-table-column label="最低价格" align="center" prop="leastPrice" min-width="100" />
-      <el-table-column label="价格取值" align="center" prop="priceType" min-width="100" />
-      <el-table-column label="开始日期" align="center" prop="startDate" min-width="100" />
-      <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
-      <el-table-column label="优先级" align="center" prop="priorityLevel" min-width="100" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-      <el-table-column label="删除标志（0代表存在" align="center" prop="delFlag" min-width="100" />
+      <el-table-column label="取价模式" align="center" prop="priceType" min-width="100" />
+      <el-table-column label="启用状态" align="center" prop="status" min-width="100" />
+      <el-table-column label="报价开始" align="center" prop="startDate" min-width="100" />
+      <el-table-column label="报价结束" align="center" prop="endDate" min-width="100" />
+
+      <el-table-column label="修改人" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="修改人编号" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="修改站点" align="center" prop="updateSite" min-width="100" />
+      <el-table-column label="修改站点ID" align="center" prop="updateSiteCode" min-width="100" />
+      <el-table-column label="修改时间" align="center" prop="updateTime" min-width="100" />
+      <el-table-column label="创建日期" align="center" prop="createTime" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="createBy" min-width="100" />
+      <el-table-column label="创建网点" align="center" prop="createSite" min-width="100" />
+      <el-table-column label="创建网点编号" align="center" prop="createSiteCode" min-width="100" />
+      <el-table-column label="创建人编号" align="center" prop="createByCode" min-width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -386,172 +167,220 @@
     />
 
     <!-- 添加或修改费用报价对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
-      <el-row :gutter="0">
+    <el-dialog :title="title" :visible.sync="open" width="1100px" :close-on-click-modal="false" append-to-body>
+      <el-row :gutter="20" type='flex'>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="24">
-            <el-form-item label="报价名称" prop="quoteName">
-              <el-input v-model="form.quoteName" placeholder="请输入报价名称" />
+          <el-col :span="8" :xs="5">
+          
+            <el-col :span="24">
+              <el-form-item label="报价名称" prop="quoteName">
+                <el-input v-model="form.quoteName" placeholder="请输入报价名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="使用网点" prop="useSiteCode">
+              <el-select v-model="form.useSiteCode" placeholder="使用网点" clearable>
+                <el-option
+                  v-for="dict in sendAreaSiteIdsOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="线路" prop="transLine">
+              <el-select v-model="form.transLine" placeholder="线路" clearable>
+                <el-option
+                  v-for="dict in transLineIdsOptions"
+                  :key="dict.label"
+                  :label="dict.label"
+                  :value="dict.label"
+                />
+              </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="产品类型" prop="prodCode">
+              <el-select v-model="form.prodCode" placeholder="产品类型" clearable>
+                <el-option
+                  v-for="dict in productIdsOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="最低价格" prop="minPrice">
+                <el-input v-model="form.minPrice" placeholder="请输入最低价格" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="价格取值" prop="priceType">
+              <el-select v-model="form.priceType" placeholder="价格取值" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="是否启用" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="报价编码" prop="quoteCode">
-              <el-input v-model="form.quoteCode" placeholder="请输入报价编码" />
-            </el-form-item>
+              <el-form-item label="开始日期" prop="startDate">
+                <el-date-picker clearable
+                  v-model="form.startDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择开始日期">
+                </el-date-picker>
+              </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="使用站点代码" prop="useSiteCode">
-              <el-input v-model="form.useSiteCode" placeholder="请输入使用站点代码" />
-            </el-form-item>
+              <el-form-item label="结束日期" prop="endDate">
+                <el-date-picker clearable
+                  v-model="form.endDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择结束日期">
+                </el-date-picker>
+              </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="使用站点名称" prop="useSite">
-              <el-input v-model="form.useSite" placeholder="请输入使用站点名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="所属线路代码" prop="transLineCode">
-              <el-input v-model="form.transLineCode" placeholder="请输入所属线路代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="所属线路名称" prop="transLine">
-              <el-input v-model="form.transLine" placeholder="请输入所属线路名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="费用类型" prop="feeType">
-              <el-input v-model="form.feeType" placeholder="请输入费用类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="产品类型代码" prop="prodCode">
-              <el-input v-model="form.prodCode" placeholder="请输入产品类型代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="产品类型名称" prop="prodName">
-              <el-input v-model="form.prodName" placeholder="请输入产品类型名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="soon_piece_type" prop="soonPieceType">
-              <el-input v-model="form.soonPieceType" placeholder="请输入soon_piece_type" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="录入付款类型" prop="recPayType">
-              <el-input v-model="form.recPayType" placeholder="请输入录入付款类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="计费类型" prop="billType">
-              <el-input v-model="form.billType" placeholder="请输入计费类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="其他类型1" prop="otherType1">
-              <el-input v-model="form.otherType1" placeholder="请输入其他类型1" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="其他类型2" prop="otherType2">
-              <el-input v-model="form.otherType2" placeholder="请输入其他类型2" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="取重方式" prop="carryType">
-              <el-input v-model="form.carryType" placeholder="请输入取重方式" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="启用状态" prop="status">
-              <el-input v-model="form.status" placeholder="请输入启用状态" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="派件区域站点" prop="dispAreaSite">
-              <el-input v-model="form.dispAreaSite" placeholder="请输入派件区域站点" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="派件区域名称" prop="dispAreaName">
-              <el-input v-model="form.dispAreaName" placeholder="请输入派件区域名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="寄件区域名称" prop="sendAreaName">
-              <el-input v-model="form.sendAreaName" placeholder="请输入寄件区域名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="寄件区域站点列表" prop="sendAreaSite">
-              <el-input v-model="form.sendAreaSite" placeholder="请输入寄件区域站点列表" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="carries_number" prop="carriesNumber">
-              <el-input v-model="form.carriesNumber" placeholder="请输入carries_number" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="discards_number" prop="discardsNumber">
-              <el-input v-model="form.discardsNumber" placeholder="请输入discards_number" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="最低价格" prop="leastPrice">
-              <el-input v-model="form.leastPrice" placeholder="请输入最低价格" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="价格取值" prop="priceType">
-              <el-input v-model="form.priceType" placeholder="请输入价格取值" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="开始日期" prop="startDate">
-              <el-date-picker clearable
-                v-model="form.startDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择开始日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-        <el-col :span="24">
-            <el-form-item label="结束日期" prop="endDate">
-              <el-date-picker clearable
-                v-model="form.endDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择结束日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="优先级" prop="priorityLevel">
-              <el-input v-model="form.priorityLevel" placeholder="请输入优先级" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
+              <el-form-item label="计费方式" prop="billType">
+              <el-radio-group v-model="form.billType">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
 
-         <!-- 
-         <el-col :span="24" v-show="moreInputVisible" >  </el-col>
+          <!-- 
+          <el-col :span="24" v-show="moreInputVisible" >  </el-col>
+          <el-col :span="24">
+              <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
+          </el-col> 
+          -->
+
+          
+        </el-col>
+        <el-col :span="16" :xs="5">
+          <el-row :gutter="16">
+            <el-col :span="9">
+              <el-form-item label="寄件区域" prop="sendAreaId">
+              <el-select v-model="form.sendAreaId" placeholder="寄件区域" clearable>
+                <el-option
+                  v-for="dict in sendAreaIdsOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-button
+            size="mini"
+            type="text"
+            @click="addArea(1)"
+          >新增区域</el-button>
+        </el-col>
+            <el-col :span="9">
+              <el-form-item label="派件区域" prop="dispAreaId">
+              <el-select v-model="form.dispAreaId" placeholder="派件区域" clearable>
+                <el-option
+                  v-for="dict in dispAreaIdsOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="3">
+            <el-button
+            size="mini"
+            type="text"
+            @click="addArea(2)"
+          >新增区域</el-button>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="" prop="remark">
+              <el-input v-model="form.sendAreaText" type="textarea" placeholder="" />
+            </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="" prop="remark">
+              <el-input v-model="form.dispAreaText" type="textarea" placeholder="" />
+            </el-form-item>
+        </el-col>
+        <el-col :span="3.5">
+            计算公式规则
+        </el-col>
+        <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAddFormula"
+        >新增公式</el-button>
+      </el-col>
          <el-col :span="24">
-             <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
-         </el-col> 
-         -->
-
+          <el-table v-loading="loading" :data="formFormulaArr" >
+          <el-table-column label="序号" align="center" prop="sort" min-width="40"/>
+          <el-table-column label="范围" align="center" prop="formula" min-width="100" />
+          <el-table-column label="公式" align="center" prop="calculationRange" min-width="100" />
+          <el-table-column label="首重(s)" align="center" prop="firstWeight" min-width="100" />
+          <el-table-column label="续重单价(d)" align="center" prop="continueWeight" min-width="100" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleEdit(scope.row)"
+              >编辑</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleCopy(scope.row)"
+              >复制</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="hDelete(scope.row)"
+              >删除</el-button>
+              <!-- 
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['emis:emisQuotePrice:remove']"
+              >删除</el-button> -->
+            </template>
+          </el-table-column>
+        </el-table>
+          </el-col>
+          </el-row>
+        </el-col>
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -560,6 +389,207 @@
       </div>
     </el-dialog>
 
+    <!--新增公式-->
+    <el-dialog :title="title" :visible.sync="openFormula" width="1100px" :close-on-click-modal="false" append-to-body>
+      <el-row :gutter="20" >
+        <el-form ref="form" :model="formFormula"  label-width="80px">
+          <el-col :span="8">
+            <el-form-item label="计算范围" prop="minCalculationRange">
+              <el-input v-model="formFormula.minCalculationRange" placeholder="最小值" />
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="<w<=" prop="maxCalculationRange">
+              <el-input v-model="formFormula.maxCalculationRange" placeholder="最大值" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公式" prop="calculationRange">
+              <el-input v-model="formFormula.calculationRange" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="序号" prop="sort">
+              <el-input v-model="formFormula.sort" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="首重(s)" prop="firstWeight">
+              <el-input v-model="formFormula.firstWeight" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="续重(d)" prop="continueWeight">
+              <el-input v-model="formFormula.continueWeight" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            说明: 计算公式中只能包含(s,w,d数字,+,.*,/).示例:0-1公斤 首重5元，1-3 公斤 每公斤2元加上首重,计算公式: 5+(w-1)*2
+          </el-col>
+
+            <el-col :span="8">&nbsp;
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="handleConfirm"
+              >保存</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                plain
+                size="mini"
+                @click="handleCancel"
+              >取消</el-button>
+            </el-col>
+        </el-form>
+      </el-row>
+    </el-dialog>  
+
+    <!-- 添加或修改区域对话框 -->
+    <el-dialog :title="title" :visible.sync="openArea" width="1100px" :close-on-click-modal="false" append-to-body>
+      <el-row :gutter="20" type='flex'>
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-col :span="14" :xs="5">
+            <el-col :span="3">
+                <el-button
+                type="primary"
+                size="mini"
+                plain
+                @click="addAreaConfirm"
+              >新增</el-button>
+            </el-col>
+            <el-col :span="3">
+                <el-button
+                size="mini"
+                plain
+                @click="delArea"
+              >删除</el-button>
+            </el-col>
+            <el-col :span="24">
+              <el-table v-loading="loading" :data="areaArr" >
+              <el-table-column label="报价区城名称" align="center" prop="areaName" min-width="100"/>
+              <el-table-column label="所属网点" align="center" prop="siteName" min-width="100" />
+              <el-table-column label="费用类型" align="center" prop="flowType" min-width="100" />
+              <el-table-column label="区域类型" align="center" prop="areaType" min-width="100" />
+              <el-table-column label="创建时间" align="center" prop="creatTime" min-width="100" />
+              </el-table>
+            </el-col>
+        </el-col>
+        <el-col :span="10" :xs="5">
+          <el-col :span="14">
+            <el-form-item label="区域名称" prop="areaName">
+              <el-input v-model="formArea.areaName" placeholder="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="区域类型" prop="areaType">
+              <el-select v-model="formArea.areaType" @change="handleAreaChange" placeholder="区域类型" clearable>
+                <el-option
+                  v-for="dict in dict.type.emis_create_area_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+                <el-button
+                type="primary"
+                size="mini"
+                plain
+                @click="addBaseArea"
+              >添加网点</el-button>
+            </el-col>
+            <el-col :span="6">
+                <el-button
+                type="danger"
+                size="mini"
+                plain
+                @click="delBaseArea"
+              >删除</el-button>
+            </el-col>
+            <el-col :span="24">
+              <el-table v-loading="loading" :data="areaBaseArr" @selection-change="handleSelectionSiteChange">
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="网点编号" align="center" prop="siteCode" min-width="100"/>
+                <el-table-column label="网点名称" align="center" prop="siteName" min-width="100" />
+                <el-table-column label="财务中心" align="center" prop="flowType" min-width="100" />
+              </el-table>
+            </el-col>
+        </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormArea">保 存</el-button>
+        <el-button @click="cancelArea">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 选择网点对话框 -->
+    <el-dialog :title="title" :visible.sync="openSite" width="700px" :close-on-click-modal="false" append-to-body>
+      <el-row :gutter="20" type='flex'>
+        <el-form ref="form" :model="formSite" :rules="rules" label-width="80px">
+              <el-col :span="8">
+                <el-form-item label="" prop="country">
+                  <el-select v-model="formSite.country" placeholder="国家" @change="hideOther" clearable filterable>
+                      <el-option
+                        v-for="item in countryIdsOptions"
+                        v-bind:key="item.label"
+                        v-bind:label="item.label"
+                        v-bind:value="item.label"
+                      />
+                    </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16" >
+                <el-input
+                v-model="siteName"
+                placeholder="网点名称搜索"
+                clearable
+                size="small"
+                prefix-icon="el-icon-search"
+                style="margin-bottom: 20px"
+                />
+              </el-col>
+              <el-col :span="24" >
+                <el-radio-group v-model="formSite.type" >
+                  <el-radio
+                    v-for="dict in siteType"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                    @change="radioChange"
+                  >{{dict.label}}</el-radio>
+                </el-radio-group><br/><br/>
+                <el-checkbox v-model="formSite.deptCheckStrictly" @change="handleCheckedTreeConnect" >全选/单选</el-checkbox>
+                <br/>
+                <el-tree
+                  ref="tree"
+                  class="filter-tree tree"
+                  :data="siteTree"
+                  :props="defaultProps"
+                  :expand-on-click-node="false"
+                  :filter-node-method="filterNode"
+                  node-key="id"
+                  highlight-current
+                  default-expand-all
+                  @node-click="handleNodeClick"
+                >
+              </el-tree>
+            </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormSite">保存</el-button>
+        <el-button @click="cancelSite">取 消</el-button>
+      </div>
+    </el-dialog>
+
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
       <emisQuotePriceForm :quoteId="currentQuoteId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
@@ -575,6 +605,12 @@
 
 <script>
 import { listEmisQuotePrice, getEmisQuotePrice, delEmisQuotePrice, addEmisQuotePrice, updateEmisQuotePrice } from "@/api/emis/emisQuotePrice";
+import { listEmisSite, getEmisSite, delEmisSite, addEmisSite, updateEmisSite } from "@/api/emis/emisSite";
+import { listEmisTransLine, getEmisTransLine, delEmisTransLine, addEmisTransLine, updateEmisTransLine,changeTransLineStatus } from "@/api/emis/emisTransLine";
+import { listEmisTransProduct, getEmisTransProduct, delEmisTransProduct, addEmisTransProduct, updateEmisTransProduct,changeTransProductStatus } from "@/api/emis/emisTransProduct";
+import { listEmisCountry, getEmisCountry, delEmisCountry, addEmisCountry, updateEmisCountry } from "@/api/emis/emisCountry";
+import { listEmisQuoteSendArea, getEmisQuoteSendArea, delEmisQuoteSendArea, addEmisQuoteSendArea, updateEmisQuoteSendArea } from "@/api/emis/emisQuoteSendArea";
+import { listEmisQuoteDispArea, getEmisQuoteDispArea, delEmisQuoteDispArea, addEmisQuoteDispArea, updateEmisQuoteDispArea } from "@/api/emis/emisQuoteDispArea";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisQuotePriceView from '@/views/emis/emisQuotePrice/emisQuotePriceView';
 import emisQuotePriceForm from '@/views/emis/emisQuotePrice/emisQuotePriceForm';
@@ -583,6 +619,7 @@ export default {
   name: "emisQuotePrice",
   components: { elDateSimplePicker,emisQuotePriceView,emisQuotePriceForm },
   dicts: [
+    'sys_normal_disable','emis_create_area_type',
   ],
   data() {
     return {
@@ -594,20 +631,39 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      siteName:null,
+      area_type:0,
+      currentQuoteId:null,
+      currentSite:null,
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
       dateTimeRange:[],
+      areaArr:[],
+      areaBaseArr:[],
+      siteTree:[],
       // 总条数
       total: 0,
+      areaIdsOptions:[],
+      countryIdsOptions:[],
       // 费用报价表格数据
       emisQuotePriceList: [],
+      sendAreaSiteIdsOptions:[],
+      transLineIdsOptions:[],
+      productIdsOptions:[],
+      dispAreaIdsOptions:[],
+      sendAreaIdsOptions:[],
+      areaTypeArr:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      formulaType:1,
 
       openForm: false,
+      openArea:false,
+      openFormula:false,
+      openSite:false,
       titleForm: "",
 
       titleEmisQuotePrice: "",
@@ -664,6 +720,18 @@ export default {
       },
       // 表单参数
       form: {},
+      sendForm:{},
+      disForm:{},
+      formFormula:{},
+      formFormulaArr:[],
+      formArea:{},
+      formSite:{},
+      currentRow:{},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      siteType:[{value:0,label:"按网点层级展示"},{value:1,label:"按省市区层级展示"}],
       // 表单校验
       rules: {
         quoteId: [
@@ -681,10 +749,118 @@ export default {
       }
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    siteName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
+    this.getSiteList();
+    this.getTransLineList();
+    this.getProductList();
+    this.getCountryList();
   },
   methods: {
+    // 所有部门节点数据
+    //getSiteAllCheckedKeys() {
+      // 目前被选中的部门节点
+      //let checkedKeys = this.$refs.site.getCheckedKeys();
+      // 半选中的部门节点
+      //let halfCheckedKeys = this.$refs.site.getHalfCheckedKeys();
+      //checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      //return checkedKeys;
+    //},
+    delArea(){
+
+    },  
+    hideOther(){
+      this.queryParams.country = this.formSite.country;
+      this.getSiteList();
+    },
+    handleCheckedTreeConnect(){
+      //this.formSite.deptCheckStrictly;
+      this.currentSite.label = "全部";
+      this.currentSite.id = "00000";
+    },
+    radioChange(){
+      //console.log(this.formSite);
+      this.queryParams.searchSiteType = this.formSite.type;
+      this.getSiteList();
+    },
+    delBaseArea(){
+      var newAreaBaseArr = [];
+      this.areaBaseArr.map((res) => {
+        var needAdd = true;
+        console.log(res);
+        this.ids.map((res1) => {
+          console.log(res1);
+          if(res.siteCode == res1){
+            needAdd = false;
+          }
+        });
+        if(needAdd == true){
+          newAreaBaseArr.push(res);
+        }
+      });
+      this.areaBaseArr = newAreaBaseArr;
+    },
+    submitFormSite(){
+      var tTree = {siteName:this.currentSite.label,siteCode:this.currentSite.id,flowType:this.currentSite.flowType,baseSiteId:this.currentSite.id};
+      //console.log(tTree);
+      this.areaBaseArr.push(tTree);
+      this.currentSite = null;
+      this.openSite = false;
+    },
+    cancelSite(){
+      this.openSite = false;
+    },
+    addBaseArea(){
+        if(this.formArea.areaType=="all"){
+          this.$modal.msgSuccess("全选不用添加区域");
+        }else{
+          this.openSite = true;
+        }
+    },
+    handleAreaChange(row){
+      console.log(row);
+      console.log(this.formArea.areaType);
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+        if(this.formSite.deptCheckStrictly!=true){
+          this.currentSite = data;
+          console.log(this.currentSite);
+        }else{
+          this.formArea.areaType = "all";
+          this.$modal.msgSuccess("全选不用单独选区域");
+        }
+    },
+    handleEdit(row){
+      this.currentRow = row;
+      this.formFormula = row;
+      this.openFormula = true;
+      this.formulaType = 2;
+    },
+    handleCopy(row){
+      var new_row = {maxCalculationRange:row.maxCalculationRange,minCalculationRange:row.minCalculationRange,formula:row.minCalculationRange+"<=<"+row.maxCalculationRange,calculationRange:row.calculationRange,sort:row.sort,firstWeight:row.firstWeight,continueWeight:row.continueWeight};
+      this.formFormulaArr.push(new_row);
+    },
+    hDelete(row){
+      var newFormFormulaArr = [];
+      this.formFormulaArr.map((res) => {
+          if(row.sort != res.sort){
+            newFormFormulaArr.push(res);
+          }
+      });
+      this.formFormulaArr = newFormFormulaArr;
+    },
     /** 查询费用报价列表 */
     getList() {
       this.loading = true;
@@ -711,11 +887,196 @@ export default {
         this.loading = false;
       });
     },
+    getCountryList() {
+      this.loading = true;
+      let qParam={
+        pageNum: 1,
+        pageSize: 300
+      }
+      listEmisCountry(qParam).then(response => {
+         this.loading = false;
+          this.countryIdsOptions = [];
+          this.countryIdsOptions.push({"value":40,"label":"中国"})
+          response.rows.forEach(item =>{
+            if(item.id != 40){
+              //var optItem={value:item.id,label:item.name};
+              //this.countryIdsOptions.push(optItem)
+            }
+          });
+      });
+    },
+    /** 查询网点列表 */
+    getSiteList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      //获取财务类型的网点
+      this.queryParams.params['type'] = "财务中心";
+      this.loading = false;
+		  this.sendAreaSiteIdsOptions = [];
+      this.sendAreaSiteIdsOptions.push({"value":0,"label":"华东财务中心"})
+      this.siteTree = [];
+      var cTree={"id":"","label":"华东财务中心","children":[]};
+      listEmisSite(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        response.rows.forEach(item =>{
+            var optItem={value:item.siteCode,label:item.siteName};
+            this.sendAreaSiteIdsOptions.push(optItem)
+            var treeItem={"id":item.siteCode,"label":item.siteName};
+            cTree.children.push(treeItem);
+        });
+        this.siteTree.push(cTree);
+      });
+    },
+     /** 查询线路列表 */
+     getTransLineList() {
+      this.loading = true;
+      this.transLineIdsOptions = [];
+      listEmisTransLine(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+         response.rows.forEach(item =>{
+            var optItem={value:item.lineName,label:item.lineName};
+            this.transLineIdsOptions.push(optItem)
+        });
+      });
+    },
+    /** 查询运输产品类型列表 */
+    getProductList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+
+      this.productIdsOptions = [];
+      listEmisTransProduct(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        response.rows.forEach(item =>{
+            var optItem={value:item.prodCode,label:item.prodName};
+            this.productIdsOptions.push(optItem)
+        });
+      });
+    },
+    getDispList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      this.dispAreaIdsOptions = [];
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisQuoteDispArea(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        var optItem={value:item.areaId,label:item.areaName};
+        this.dispAreaIdsOptions.push(optItem)
+        this.loading = false;
+      });
+    },
+    geSendtList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      this.sendAreaIdsOptions = [];
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisQuoteSendArea(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        var optItem={value:item.areaId,label:item.areaName};
+        this.sendAreaIdsOptions.push(optItem)
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
+    // 取消按钮
+    cancelArea() {
+      this.openArea = false;
+    },
+    handleConfirm(){
+      if(this.formulaType==1){
+        var tTree = {maxCalculationRange:this.formFormula.maxCalculationRange,minCalculationRange:this.formFormula.minCalculationRange,formula:this.formFormula.minCalculationRange+"<=<"+this.formFormula.maxCalculationRange,calculationRange:this.formFormula.calculationRange,sort:this.formFormula.sort,firstWeight:this.formFormula.firstWeight,continueWeight:this.formFormula.continueWeight};
+        this.formFormulaArr.push(tTree);
+        this.openFormula = false;
+        this.formFormula = {};
+      }else{
+        this.currentRow.formula = this.formFormula.minCalculationRange+"<=<"+this.formFormula.maxCalculationRange;
+        this.openFormula = false;
+        this.formFormula = {};
+      }
+      this.form.formFormulaArr = this.formFormulaArr;
+    },
+    handleCancel(){
+      this.openFormula = false;
+    },
+    submitFormArea(){
+      //console.log(this.formArea.areaName);
+      if(this.formArea.areaName == undefined){
+        this.$modal.msgSuccess("报价区域名称不能为空!");
+        return;
+      }
+      if (Array.isArray(this.areaBaseArr) && this.areaBaseArr.length === 0&&this.formArea.areaType != 'all') {
+        this.$modal.msgSuccess("网点不能为空!");
+      }
+      var siteNameStr = "";
+      var siteCodeStr = "";
+      const date = new Date();
+      const year = date.getFullYear();  
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');  
+      const day = date.getDate().toString().padStart(2, '0');
+      const hour = date.getHours().toString().padStart(2, '0');
+      const minute = date.getMinutes().toString().padStart(2, '0');
+      const second = date.getSeconds().toString().padStart(2, '0');
+      const currentTime = `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+      //console.log(this.formArea.areaType);
+      if(this.formArea.areaType != 'all'){
+        this.areaBaseArr.map((res) => {
+            //console.log(res);
+            siteNameStr+=res.siteName+",";
+            siteCodeStr+=res.siteCode+",";
+        });
+        if (siteNameStr.charAt(siteNameStr.length - 1) === ",") {
+          siteNameStr = siteNameStr.slice(0, -1);
+        }
+        if (siteCodeStr.charAt(siteCodeStr.length - 1) === ",") {
+          siteCodeStr = siteCodeStr.slice(0, -1);
+        }
+        var tTree = {"feeType":"运输费","useSiteCode":siteCodeStr,"useSite":siteNameStr,"areaType":"网点","siteName":siteNameStr,"siteCodeStr":siteCodeStr,"flowType":"运输费","areaName":this.formArea.areaName,"creatTime":currentTime};
+        this.areaArr.push(tTree);
+      }else{
+        var tTree = {"feeType":"运输费","useSiteCode":"00000","useSite":"全部","areaType":"全部","siteName":"全部","siteCodeStr":"00000","flowType":"运输费","areaName":this.formArea.areaName,"creatTime":currentTime};
+        this.areaArr.push(tTree);
+      }
+      //保存数据赋值
+      if(this.areaType==1){
+        this.sendForm = tTree;
+        //submitSendForm()；
+      }else{
+        this.disForm = tTree;
+        //submitDispForm()；
+      }
+      //this.openArea = false;
+      this.formArea = {};
+      this.areaBaseArr = [];
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -779,12 +1140,19 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    handleSelectionSiteChange(selection) {
+      this.ids = selection.map(item => item.baseSiteId)
+      console.log(this.ids);
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
     /** 新增按钮操作 */
     handleAdd(row) {
       this.reset();
       this.open = true;
-      this.title = "新增";
-
+      this.title = "新增运输费";
+      this.getDispList();
+      this.getSendList();
     // 子组件打开模式
     //   if(row != undefined){
     //     this.currentParentQuoteId = row.quoteId
@@ -792,6 +1160,37 @@ export default {
     //   this.openEmisQuotePrice = true;
     //   this.titleEmisQuotePrice = "新增";
     },
+
+    handleAddFormula(){
+      this.openFormula = true;
+      this.formulaType = 1;
+      this.title = "新增公式";
+    },
+
+    /** 新增按钮操作 */
+    addArea(areaType) {
+      this.openArea = true;
+      this.title = "新增区域";
+      this.areaType = areaType;
+    },
+    addAreaConfirm(){
+      var quoteAreaNameStr = "";
+      this.areaArr.map((res) => {
+        quoteAreaNameStr+=res.areaName+",";
+      });
+      if (quoteAreaNameStr.charAt(quoteAreaNameStr.length - 1) === ",") {
+        quoteAreaNameStr = quoteAreaNameStr.slice(0, -1);
+      }
+      if(this.areaType==1){
+          this.form.sendAreaText = quoteAreaNameStr;
+          this.form.sendArea = this.areaArr;
+      }else{
+          this.form.dispAreaText = quoteAreaNameStr;
+          this.form.dispArea = this.areaArr;
+      }
+      this.areaArr = [];
+      this.openArea = false;
+    },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
@@ -802,7 +1201,7 @@ export default {
       getEmisQuotePrice(quoteId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        this.title = "编辑运输费";
       });
 
        // 子组件打开模式
@@ -837,6 +1236,40 @@ export default {
         }
       });
     },
+    /** 提交按钮 */
+    submitSendForm() {
+      if (this.sendForm.areaId != null) {
+        updateEmisQuoteSendArea(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getSendList();
+        });
+      } else {
+        addEmisQuoteSendArea(this.sendForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getSendList();
+        });
+      }
+
+    },
+    /** 提交按钮 */
+    submitDispForm() {
+      if (this.disForm.areaId != null) {
+        updateEmisQuoteDispArea(this.dispForm).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getDispList();
+        });
+      } else {
+        addEmisQuoteDispArea(this.dispForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getDispList();
+        });
+      }
+
+    },
     handleFormChanged(){
         this.openForm = false;
         this.getList();