Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

# Conflicts:
#	src/views/emis/emisQuotePrice/index.vue

src/views/emis/emisQuotePrice/index.vue

@@ -10,49 +10,61 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="startDate">
+      <el-form-item label="" prop="useSiteCode">
-        <el-date-picker clearable
-          v-model="queryParams.startDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="报价开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="报价结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <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.dispAreaSite"
+          v-model="queryParams.useSiteCode"
-          placeholder="派件区域"
+          placeholder="报价网点编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="status">
+      <el-form-item label="" prop="useSite">
-        <el-select v-model="queryParams.status" placeholder="报价状态" clearable>
+        <el-input
-          <el-option
+          v-model="queryParams.useSite"
-            v-for="dict in dict.type.sys_normal_disable"
+          placeholder="报价网点名称"
-            :key="dict.value"
+          clearable
-            :label="dict.label"
+          @keyup.enter.native="handleQuery"
-            :value="dict.value"
+        />
-          />
+      </el-form-item>
-        </el-select>
+      <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>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -529,7 +541,6 @@
         <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'>
@@ -644,6 +655,7 @@ export default {
       siteTree:[],
       // 总条数
       total: 0,
+      currentId:null,
       areaIdsOptions:[],
       countryIdsOptions:[],
       // 费用报价表格数据