Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/views/hisStore/storeOrder/dimensionStatistics/index.vue

@@ -132,6 +132,8 @@
       <el-table-column label="员工名称" align="center" prop="nickName"/>
       <el-table-column label="总单数" align="center" prop="totalNum"/>
       <el-table-column label="总金额" align="center" prop="totalPrice"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="在途单数" align="center" prop="transitNum"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="在途金额" align="center" prop="transitPrice"/>
       <el-table-column label="成交单数" align="center" prop="dealNum"/>
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="成交金额" align="center" prop="dealPrice"/>
       <el-table-column v-if="zdyInfo === 'gzzdy'" label="实收金额" align="center" prop="dealPrice"/>
@@ -142,6 +144,7 @@
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="发货单数" align="center" prop="invoiceNum"/>
       <el-table-column v-if="zdyInfo !== 'gzzdy'" label="发货金额" align="center" prop="invoicePrice"/>
       <el-table-column v-if="zdyInfo === 'gzzdy'" label="代收金额" align="center" prop="invoicePrice"/>
+      <el-table-column v-if="zdyInfo === 'gzzdy'" label="结算金额" align="center" prop="settlementPrice"/>
       <el-table-column label="签收单数" align="center" prop="signForNum"/>
       <el-table-column label="签收金额" align="center" prop="signFPrice"/>
       <el-table-column label="退单数" align="center" prop="chargebackNum"/>

src/views/hisStore/storeOrder/index.vue

@@ -13,7 +13,7 @@
       </el-form-item>
 
      <el-form-item>
-          <treeselect style="width: 220px" :clearable="false"  v-model="queryParams.deptId"  :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          <treeselect style="width: 220px" :clearable="true"  v-model="queryParams.deptId"  :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
      </el-form-item>
 
       <!-- <el-form-item label="订单号" prop="orderCode">
@@ -2313,6 +2313,8 @@ export default {
       this.deliverySendTimeRange = []
       this.deliveryImportTimeRange = []
       this.resetForm("queryForm");
+      //重置部门选择器
+      this.queryParams.deptId = null;
       // 清除排序
       this.currentSort = {
         prop: null,