Merge remote-tracking branch 'origin/dev1.6' into dev1.6

.env.sit

@@ -2,7 +2,7 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 捷道管理系统 - 开发板
+VUE_APP_TITLE = 捷道管理系统 - 开发版
 
 # 捷道管理系统/开发环境
 VUE_APP_BASE_API = 'https://api.sit.jdshangmen.com'

src/api/ecw/coupon.js

@@ -69,4 +69,13 @@ export function getCustomerAvailableCouponList(data){
     method: 'post',
     data
   })
+}
+
+// 更新优惠券有效期
+export function updateEndtime(data){
+  return request({
+    url: '/product/coupon/update/endTime',
+    method: 'put',
+    data
+  })
 }
\ No newline at end of file

src/api/ecw/customer.js

@@ -51,6 +51,16 @@ export function getCustomerPage(query) {
     params: query
   })
 }
+/**
+ * 获得部门客户
+ * */
+export function getCustomerDeptPage(query){
+  return request({
+    url:'/ecw/customer/deptPage',
+    method:'get',
+    params:query
+  })
+}
 
 // 获得客户下拉
 export function getCustomerSelect(query) {
@@ -350,3 +360,22 @@ export function testEnterToOpenSea(customerId) {
     params: {customerId}
   })
 }
+
+/**
+ * 获取常用提货网点
+ * */
+ export function getServiceNetwork(){
+   return request({
+     url:'/ecw/node/list',
+     method:'get',
+   })
+}
+//设置空运客户
+export function changeCustomerAir(data){
+   return request({
+     url:'/ecw/customer/change-customer-air',
+     method:'put',
+     data
+
+   })
+}

src/api/ecw/offer.js

@@ -123,4 +123,13 @@ export function recovery(id) {
     method: 'delete',
     params: {id}
   })
-}
\ No newline at end of file
+}
+
+// 获取部门报价单列表
+export function offerDeptPage(params) {
+  return request({
+    url: '/ecw/offer/dept/page',
+    method: 'get',
+    params
+  })
+}

src/api/ecw/order.js

@@ -505,3 +505,39 @@ export function warehousePictureList(data){
     data
   })
 }
+
+// 获得部门订单分页
+export function deptOrderPage(params){
+  return request({
+    url: '/ecw/order/dept-order-page',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得订单统计
+export function orderStatistics(params){
+  return request({
+    url: '/ecw/order/statistics',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得我的订单统计
+export function orderMyStatistics(params){
+  return request({
+    url: '/ecw/order/my/statistics',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得部门订单统计
+export function orderDeptStatistics(params){
+  return request({
+    url: '/ecw/order/dept/statistics',
+    method: 'GET',
+    params
+  })
+}
\ No newline at end of file

src/components/ChooseContactDialog/index.vue

@@ -11,6 +11,7 @@
                 <div class="line">
                     <div class="label">{{$t('姓名')}}：</div>
                     <div class="value">{{item.contactsName}}</div>
+                    <el-tag v-if="item.isInOpenSea" type="danger" effect="dark">{{$t('公')}}</el-tag>
                 </div>
                 <div class="line">
                     <div class="label">{{$t('电话')}}：</div>

src/router/index.js

@@ -264,11 +264,18 @@ export const constantRoutes = [
         meta: {title: '佣金设置', titleEn:'Commission settings', icon: '', activeMenu: '/customer/customerCommissionInfo'},
         props: true,
       },
+      // {
+      //   path: 'edit/:customerId(\\d+)',
+      //   component: (resolve) => import('@/views/ecw/customer/edit'),
+      //   props: true,
+      //   name: 'customerEdit',
+      //   meta: {title:'编辑客户',titleEn:'Edit Customer', icon: ''}
+      // },
       {
-        path: 'edit/:customerId(\\d+)',
+        path: 'edit-distribution/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/edit'),
         props: true,
-        name: 'customerEdit',
+        name: 'allocatedCustomerEdit',
         meta: {title:'编辑客户',titleEn:'Edit Customer', icon: ''}
       },
       {

src/utils/dict.js

@@ -117,6 +117,7 @@ export const DICT_TYPE = {
   ECW_CANCEL_PICK_TYPE: 'cancel_pick_type', // 取消放货类型
   ECW_CUSTOMER_RESOURCE_TYPE: 'customer_resource_type', // 客户资源类型
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
+  ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/utils/ruoyi.js

@@ -84,7 +84,7 @@ export function addDateRange(params, dateRange, propName) {
  *                大小为 2 的数组，每个时间为 yyyy-MM-dd 格式
  * @param propName 加入的参数名，可以为空
  */
-export function addBeginAndEndTime(params, dateRange, propName) {
+export function addBeginAndEndTime(params, dateRange, propName,isTime = true) {
   // 必须传入参数
   if (!dateRange) {
     return params;
@@ -97,10 +97,10 @@ export function addBeginAndEndTime(params, dateRange, propName) {
   }
   // 设置参数
   if (dateRange[0]) {
-    params['begin' + propName] = dateRange[0] + ' 00:00:00';
+    params['begin' + propName] = dateRange[0] + (isTime ? ' 00:00:00':'');
   }
   if (dateRange[1]) {
-    params['end' + propName] = dateRange[1] + ' 23:59:59';
+    params['end' + propName] = dateRange[1] + (isTime ? ' 23:59:59' : '');
   }
   return params;
 }

src/views/ecw/coupon/index.vue

@@ -188,6 +188,8 @@
                      v-hasPermi="['ecw:coupon:update']">{{ $t('编辑') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)"
                      v-hasPermi="['ecw:coupon:create']">{{ $t('复制') }}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="updateEndtimeItem = scope.row"
+                     v-hasPermi="['ecw:coupon:update']">{{ $t('延期') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:coupon:delete']">{{ $t('删除') }}</el-button>
         </template>
@@ -196,12 +198,32 @@
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
+    
+    <el-dialog :title="$t('延期活动时间')" :visible="!!updateEndtimeItem" :before-close="() => updateEndtimeItem=null">
+      <div v-if="updateEndtimeItem">
+        {{$t('优惠活动“{name}”的当前结束时间：{time}',{
+          name: updateEndtimeItem.name,
+          time: updateEndtimeItem.endTime || $t('永久有效')
+          })}}
+      </div>
+      <div>{{$t('请问您确定延长活动吗？')}}</div>
+      <el-form :model="updateEndtimeForm" :rules="updateEndtimeRules" label-position="left" >
+        <el-form-item :label="$t('活动结束时间')" prop="endTime">
+          <el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="updateEndtimeForm.endTime" placeholder=""></el-date-picker>
+          <el-checkbox :label="$t('永久有效')" v-model="updateEndtimeForm.forever" class="ml-10"></el-checkbox>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="updateEndtime">{{$t('确定')}}</el-button>
+        <el-button type="default" @click="updateEndtimeItem = null">{{$t('取消')}}</el-button>
+      </div>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { createCoupon, updateCoupon, deleteCoupon, getCoupon, getCouponPage, exportCouponExcel } from "@/api/ecw/coupon";
+import { createCoupon, updateCoupon, deleteCoupon, getCoupon, getCouponPage, exportCouponExcel, updateEndtime } from "@/api/ecw/coupon";
 
 export default {
   name: "EcwCouponIndex",
@@ -260,9 +282,20 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      updateEndtimeItem: null, // 延期操作的数据
+      updateEndtimeForm:{} // 延长有效期的表单数据
     };
   },
+  computed:{
+    updateEndtimeRules(){
+      return {
+        endTime: [
+          {required: !this.updateEndtimeForm.forever, message: "请填写结束时间"}
+        ]
+      }
+    }
+  },
   created() {
     this.getList();
   },
@@ -331,6 +364,18 @@ export default {
           this.$message.success(this.$t("删除成功"));
         }).catch(() => {});
     },
+    // 延期
+    updateEndtime(){
+      if(!this.updateEndtimeForm.forever && !this.updateEndtimeForm.endTime){
+        return this.$message.error(this.$t("请填写结束时间"))
+      }
+      let form = {couponId: this.updateEndtimeItem.couponId, ...this.updateEndtimeForm}
+      form.isValidity = !form.forever // 是否设置有效期
+      updateEndtime(form).then(res => {
+        this.getList()
+        this.updateEndtimeItem = null
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数

src/views/ecw/currency/index.vue

@@ -107,9 +107,13 @@
         <el-form-item label="100外币兑人民币汇率" prop="huilv">
           <el-input v-model="form.huilv" placeholder="请输入100外币兑人民币汇率汇率" />
         </el-form-item>
-        <el-form-item label="100人民币兑外币汇率" prop="huilv">
-          {{ form.huilv ? (10000 / form.huilv).toFixed(6) : ''}}
+
+        <el-form-item label="100人民币兑外币汇率" prop="exchangeToFc">
+          <el-input v-model="form.exchangeToFc" placeholder="请输入100人民币兑外币汇率" />
         </el-form-item>
+        <!-- <el-form-item label="100人民币兑外币汇率" prop="huilv">
+          {{ form.huilv ? (10000 / form.huilv).toFixed(6) : ''}}
+        </el-form-item> -->
         <el-form-item :label="$t('排序')" prop="aorder">
           <el-input v-model="form.aorder" :placeholder="$t('请输入排序')" />
         </el-form-item>

src/views/ecw/customer/edit.vue

@@ -33,7 +33,10 @@
 
             <el-col :span="12">
               <el-form-item :label="$t('出货渠道')" prop="transportType">
-                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" form-type="checkbox" multiple v-model="form.transportType"></dict-selector>
+<!--                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"  form-type="checkbox" multiple v-model="form.transportType"></dict-selector>-->
+                <el-checkbox-group v-model="form.transportType">
+                  <el-checkbox  v-for="item in getDictDatas(DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE)" :key="item.value"  :label="item.value" :disabled="item.value == 4">{{item.label}}</el-checkbox>
+                </el-checkbox-group>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -42,8 +45,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('资源类型')" prop="remarks">
-                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="form.resourceType" formatter="number"></dict-selector>
+<!--              <el-form-item :label="$t('资源类型')" prop="remarks">-->
+<!--                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="form.resourceType" formatter="number"></dict-selector>-->
+<!--              </el-form-item>-->
+              <el-form-item :label="$t('常用提货网点')" prop="remarks">
+               <el-select v-model="form.pickupPoint">
+                 <el-option v-for="item in serviceNetworkList " :value="item.id" :label="isChinese ? item.titleZh : item.titleEn "></el-option>
+               </el-select>
               </el-form-item>
             </el-col>
 
@@ -106,7 +114,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('客户经理')" prop="customerService">
-                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(customerId !== '0' || isCustomerServiceConfirmed)">
+                {{$route.nam}}
+                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="((customerId !== '0' && $route.name !== 'allocatedCustomerEdit')) || isCustomerServiceConfirmed">
                   <el-option v-for="item in serviceUserList"
                              :key="item.id" :label="item.nickname" :value="item.id" />
                 </el-select>
@@ -205,6 +214,14 @@
                 <customer-line-table v-if="showPao1" :warehouse-list="warehouseList" :import-city-list="importCityList" v-model="paoLines" :zhong-pao-type="2"></customer-line-table>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item v-hasPermi="['ecw:customer:query-card']" :label="$t('身份证姓名')">
+                <el-input v-model="form.carName"></el-input>
+              </el-form-item>
+              <el-form-item  v-hasPermi="['ecw:customer:query-card']" :label="$t('身份证号码')">
+                <el-input v-model="form.carNo" ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-card class="box-card">
@@ -417,7 +434,7 @@ import {
   getCustomerPage, memberUserList,
   updateCustomer,
   userMemberUserList,
-  getCustomerLines, fillupCustomeInfo
+  getCustomerLines, fillupCustomeInfo, getServiceNetwork
 } from '@/api/ecw/customer'
 import {getNodeList} from "@/api/ecw/node"
 import { getProductTypeList } from '@/api/ecw/productType'
@@ -437,9 +454,7 @@ import MemberSelector from '@/components/MemberSelector'
 
 export default {
   name: "edit",
-  props: {
-    customerId: String,
-  },
+
   components: {
     Template,
     upload,
@@ -517,6 +532,10 @@ export default {
     getCountryListAll().then(r => {
       this.countryList = r.data
     })
+     // 获取服务网点
+     getServiceNetwork().then(r =>{
+        this.serviceNetworkList = r.data
+     })
   },
   data(){
     return {
@@ -566,7 +585,8 @@ export default {
       zhongLines: [], // 重货线路
       paoLines: [], // 泡货线路
       memberList:[],//会员列表
-      selectMemberList:[]//选中会员列表
+      selectMemberList:[],//选中会员列表
+      serviceNetworkList:[] //网点列表
     }
   },
 
@@ -751,13 +771,15 @@ export default {
         weightUnit: undefined,
         createTime: undefined,
         isShowTidanPrice:true,
+        carName:undefined,
+        carNo:undefined,
       };
       this.form.createTime = (new Date()).getTime()
       this.resetForm("form");
     },
     getCustomer(id) {
       return getCustomer(id).then(response => {
-        this.form = { ...this.form, ...response.data, id: this.customerId };
+        this.form = { ...this.form, ...response.data, id: this.customerId,transportType:  response.data.transportType.split(',') };
         this.open = true;
         this.title = this.$t('修改客户');
         this.getZhongPao()
@@ -776,7 +798,7 @@ export default {
     handleAddContact() {
       this.form.customerContacts.push({
         "areaCode": "",
-        // "customerId": 0,
+        // "customerId": 0,q
         "department": "",
         "email": "",
         "isDefault": this.form.customerContacts.length === 0 ? 1 : 0,
@@ -817,6 +839,9 @@ export default {
     userId(){
       return  this.$store.state.user.id
     },
+    customerId(){
+      return this.$route.params.customerId;
+    },
     /* userMemberUser(){
      let list = this.memberList.filter(item => {
         return this.selectMemberList.findIndex(i => i.id === item.id) < 0

src/views/ecw/customer/indirectCustomer.vue

@@ -22,8 +22,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange"  range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
@@ -152,7 +152,7 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行导出
       this.$modal.confirm(this.$t('是否确认导出间接客户数据项?')).then(() => {
         this.exportLoading = true;
@@ -175,7 +175,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行查询
       getCustomerPage(params).then(response => {
         this.list = response.data.list;

src/views/ecw/customerConfirm/index.vue

@@ -46,8 +46,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
         <el-select clearable  v-model="queryParams.creditLevel" >
@@ -444,7 +444,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行查询
       getWaitForConfirmList(params).then(response => {
         this.list = response.data.list;

src/views/ecw/customerToBeAssigned/index.vue

@@ -47,8 +47,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange"  range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
         <el-select clearable  v-model="queryParams.creditLevel" >
@@ -268,7 +268,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行查询
       getCustomerToBeAssigned(params).then(response => {
         this.list = response.data.list;
@@ -359,7 +359,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push('/customer/edit/' + row.id)
+      this.$router.push('/customer/edit-distribution/' + row.id)
       // this.reset();
       // const id = row.id;
       // getCustomer(id).then(response => {

src/views/ecw/deptTarget/myAchievement.vue

@@ -32,7 +32,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item>
-        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker v-model="dateFilter"  type="datetimerange" range-separator="-"  :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 <!--        <el-date-picker v-model="queryParams.beginStartTime" :placeholder="$t('请选择开始时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->
       </el-form-item>
 <!--      <el-form-item :label="$t('结束时间')" prop="endStartTime">-->

src/views/ecw/myCustomerService/index.vue

@@ -41,8 +41,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
 
       <el-form-item :label="$t('信用等级')" prop="department">
@@ -258,7 +258,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行查询
       getMyCustomerService(params).then(response => {
         this.list = response.data.list;

src/views/ecw/offer/index.vue

@@ -10,11 +10,11 @@
       <el-form-item :label="$t('客户')" prop="searchCustomer">
         <el-input v-model="queryParams.searchCustomer" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      
+
       <el-form-item :label="$t('创建时间')" prop="orderNo">
-        <el-date-picker v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker    type="datetime" v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endCreateTime"    type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
-      
+
       <el-form-item :label="$t('始发地')" prop="departureId">
         <el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发地')" clearable>
           <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
@@ -47,14 +47,14 @@
 
       <div>
         <el-form-item :label="$t('预计结束时间')" prop="orderNo">
-            <el-date-picker v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            <el-date-picker  type="datetime" v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker  type="datetime" v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
         </el-form-item>
       </div>
-      
+
     </el-form>
 
     <!-- 操作工具栏 -->
@@ -95,7 +95,7 @@
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
         </template>
       </el-table-column>
-      
+
 
       <el-table-column :label="$t('预计销售额')" align="left" prop="estCost">
         <template slot-scope="{row}">
@@ -109,7 +109,7 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- 
+          <!--
           0 取消                                        恢复
           1 特价审批    编辑、跟进、          取消    删除
           2 草稿        编辑、                       删除
@@ -131,7 +131,7 @@
               <el-dropdown-item @click.native="recovery(scope.row.offerId)"                                                    v-if="[0].indexOf(scope.row.status) > -1"              v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-dropdown-item>
               <el-dropdown-item @click.native="deleteOffer(scope.row.offerId)"                                                 v-if="[0,1,2,3,4,5,6,7].indexOf(scope.row.status) > -1"  v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>          
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -143,7 +143,7 @@
 </template>
 
 <script>
-import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery } from "@/api/ecw/offer";
+import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery, offerDeptPage } from "@/api/ecw/offer";
 import { getCurrencyList } from '@/api/ecw/currency';
 import {getTradeCityList} from '@/api/ecw/region'
 import UserSelector from '@/components/UserSelector'
@@ -170,8 +170,8 @@ export default {
         pageSize: 10
       },
       currencyList: [],
-      tradeCityList:[]
-
+      tradeCityList:[],
+      dept: false, // 是否部门订单
     };
   },
   computed:{
@@ -193,6 +193,11 @@ export default {
     this.getList()
   },
   created() {
+    console.log("offer index", this.$route)
+    // 部门订单
+    if(this.$route.fullPath.indexOf('dept') > -1){
+      this.dept = true
+    }
     getTradeCityList().then(res => this.tradeCityList = res.data)
 
     getCurrencyList().then(res => {
@@ -205,8 +210,9 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      let func = this.dept ? offerDeptPage : getOfferPage
       // 执行查询
-      getOfferPage(this.queryParams).then(response => {
+      func(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;

src/views/ecw/order/dept.vue

+<template>
+    <index dept />
+</template>
+<script>
+import Index from './index'
+export default {
+    name: 'EcwOrderDept',
+    components: {Index}
+}
+</script>
\ No newline at end of file

src/views/ecw/order/index.vue

@@ -18,8 +18,7 @@
       </el-form-item>
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
-        <el-date-picker v-model="dateFilter"
-          type="daterange" range-separator="-"
+        <el-date-picker v-model="dateFilter" type="datetimerange"  range-separator="-"
           :start-placeholder="$t('开始日期')"
           :end-placeholder="$t('结束日期')"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -103,7 +102,7 @@
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item :label="$t('审核状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.AUDIT_STATUS" v-model="queryParams.auditResult"
+        <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditResult"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
 
@@ -125,8 +124,29 @@
         <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button>
+        <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button> -->
+        <el-dropdown v-hasPermi="['ecw:order:export']">
+          <el-button type="primary" :loading="exportLoading" size="mini">
+            导出 <i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="exportChecked">导出勾选</el-dropdown-item>
+            <el-dropdown-item @click.native="exportSearch">导出搜索</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">异常单统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">重货单统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">退仓单统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">售后赔偿金额统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">报关数据统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">客户出货量统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">预付运费统计</el-dropdown-item>
+            <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-col>
+      <el-col :span="15" v-if="statistics">
+        <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
+        合计：{{statistics.totalNum}}箱，{{statistics.totalVolume}}m³(测) {{statistics.totalChargeVolume}}m³(重) {{statistics.totalWeight}}KG
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -419,7 +439,11 @@ import {
   orderSpecialNeed,
   cancelOrder,
   recoveryOrder,
-  getMyOrderPage
+  getMyOrderPage,
+  deptOrderPage,
+  orderStatistics,
+  orderMyStatistics,
+  orderDeptStatistics
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -445,7 +469,8 @@ export default {
     CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   props: {
-    mine: Boolean
+    mine: Boolean, // 标识我的订单列表
+    dept: Boolean // 标识部门订单列表
   },
   data() {
     return {
@@ -502,7 +527,8 @@ export default {
         page: 1,
         rows: 20,
       },
-      currencyList:[]
+      currencyList:[],
+      statistics: null ,// 统计数据
     };
   },
   watch:{
@@ -566,6 +592,29 @@ export default {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
+    // 导出勾选
+    exportChecked(){
+      if(!this.ids.length){
+        return this.$message.error(this.$t('请勾选需要导出的订单'))
+      }
+      return this.exportExcel(exportOrderExcel, {orderIdList: this.ids})
+    },
+    // 导出搜索
+    exportSearch(){
+      return this.exportExcel(exportOrderExcel, this.combinedQueryParams)
+    },
+    // 通用导出函数
+    exportExcel(func, params, fileName = null){
+      this.exportLoading = true;
+      func(params).then(res => {
+        if(!fileName){
+          fileName = this.$t('订单')
+        }
+        this.$download.excel(res, fileName + '.xls');
+      }).finally(() => {
+        this.exportLoading = false
+      })
+    },
     // 提取路径中的运输方式
     getTransportFromRoute(){
         let match = this.$route.path.match(/transport_(\d)/)
@@ -604,19 +653,37 @@ export default {
     getList() {
       this.loading = true;
       console.log('this.combinedQueryParams', this.combinedQueryParams)
+      let func = getOrderPage
       if(this.mine){
-        return getMyOrderPage(this.combinedQueryParams).then(response => {
+        func = getMyOrderPage
+        /* return getMyOrderPage(this.combinedQueryParams).then(response => {
           this.list = response.data.list;
           this.total = response.data.total;
           this.loading = false;
-        });
+        }); */
+      }else if(this.dept){
+        func = deptOrderPage
       }
       // 执行查询
-      getOrderPage(this.combinedQueryParams).then(response => {
+      func(this.combinedQueryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
+
+      this.getStatistics()
+    },
+    // 获得统计数据
+    getStatistics(){
+      let func = orderStatistics
+      if(this.mine){
+        func = orderMyStatistics
+      }else if(this.dept){
+        func = orderDeptStatistics
+      }
+      func(this.combinedQueryParams).then(res => {
+        this.statistics = res.data
+      })
     },
 
     /** 搜索按钮操作 */

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -25,7 +25,9 @@
                     v-model="form.brand"
                     :placeholder="$t('可修改')"
                     filterable
+                    remote
                     @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
                     clearable>
                     <el-option
                       v-for="item in brandList"
@@ -197,7 +199,9 @@
                     v-model="form1.brand"
                     :placeholder="$t('可修改')"
                     filterable
+                    remote
                     @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
                     clearable>
                     <el-option
                       v-for="item in brandList"
@@ -410,17 +414,6 @@ export default {
     }
   },
 
-  mounted() {
-    getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = r.data.list.map(e => {
-        if(e.id){
-          e.id = e.id.toString()
-        }
-        return e
-      })
-    })
-  },
-
   data() {
     return {
       DICT_TYPE,
@@ -497,6 +490,9 @@ export default {
         if (this.warehousing) {
           // this.orderItem = this.warehousing
           this.inTime = this.warehousing.inTime
+          if (!!this.warehousing.brandName){
+            this.getProductBrandPage(this.warehousing.brandName)
+          }
         }
       } else {
       }
@@ -535,8 +531,17 @@ export default {
       }
     }
   },
-
   methods: {
+    getProductBrandPage(titleZh = undefined) {
+      getProductBrankPage({pageSize: 20, titleZh}).then(r => {
+        this.brandList = r.data.list.map(e => {
+          if(e.id){
+            e.id = e.id.toString()
+          }
+          return e
+        })
+      })
+    },
     handleCancelProcessInstance(){
       this.$prompt('请输入取消原因？', this.$t("取消流程"), {
         type: 'warning',
@@ -694,9 +699,9 @@ export default {
       }
       const form = val === 1 ? this.form1 : this.form
       form.orderWarehouseInItemDoList.push({
-        "boxGauge1": "",
-        "boxGauge2": "",
-        "boxGauge3": "",
+        "boxGauge1": 0,
+        "boxGauge2": 0,
+        "boxGauge3": 0,
         "cartonsNum": cartonsNum > 0 ? cartonsNum : '',
         "expressNo": "",
         "quantityAll": undefined,
@@ -732,7 +737,7 @@ export default {
           const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList
           return {...e, boxGauge1, boxGauge2, boxGauge3}
         }
-        return e
+        return {...e, boxGauge1: 0, boxGauge2: 0, boxGauge3: 0}
       })
     },
     tableData1() {

src/views/ecw/order/warehousing/index.vue

@@ -174,7 +174,7 @@
         <el-form-item :label="$t('原因类型')">
           <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
-        <el-form-item required :label="$t('附件')">
+        <el-form-item :label="$t('附件')">
           <image-upload v-model="form.exceptionUrls"></image-upload>
         </el-form-item>
         <el-form-item :label="$t('详细信息')">
@@ -392,7 +392,7 @@ export default {
       }
 
       if (this.escapeBol) {
-        form.exceptionUrls = this.form.exceptionUrls.split(',');
+        form.exceptionUrls = this.form.exceptionUrls.length !== 0 ? this.form.exceptionUrls?.split(',') : []
         form.descZh = this.form.descZh;
         form.manualExceptionType = this.form.manualExceptionType.join(',')
       }

src/views/member/user/index.vue

@@ -19,6 +19,15 @@
       <el-form-item :label="$t('审核状态')" prop="registerIp">
         <dict-selector v-model="queryParams.auditStatus" :type="DICT_TYPE.AUDIT_STATUS"></dict-selector>
       </el-form-item>
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          type="datetimerange"
+          :start-placeholder="$t('开始日期')"
+           value-format="yyyy-MM-dd HH:mm:ss"
+          :end-placeholder="$t('结束日期')">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -378,8 +387,8 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeLoginDate, 'loginDate');
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // this.addBeginAndEndTime(params, this.dateRangeLoginDate, 'loginDate');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime', false);
       // 执行查询
       getUserPage(params).then(response => {
         this.list = response.data.list;

src/views/system/dict/index.vue

@@ -101,7 +101,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 
 export default {
-  name: "Dict",
+  name: "SystemDictIndex",
   data() {
     return {
       // 遮罩层
@@ -151,6 +151,9 @@ export default {
   created() {
     this.getList();
   },
+  activated(){
+    this.getList();
+  },
   methods: {
     /** 查询字典类型列表 */
     getList() {