Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -7,6 +7,7 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+        <router-link class="right-menu-item" to="/chat/chat">捷哥</router-link>
         <div class="right-menu-item">
           <el-image style="width: 22px;height: 22px;cursor: pointer;" :src="helpIcon" @click="tohelp"></el-image>
         </div>

src/views/chat.vue

+<template>
+    <iframe src="https://chat.groupage.cn/" class="iframe"></iframe>
+</template>
+<style>
+    .iframe{
+        width: 100%;
+        height: calc(100vh - 84px);
+        border: none;
+    }
+</style>

src/views/ecw/box/indexFutureBox.vue

@@ -75,7 +75,7 @@
       </el-table-column>
        <el-table-column :label="$t('异常订单方数')" align="center" prop="exceptionNumber">
         <template slot-scope="{row}">
-          {{row.getExceptionVolume || 0}}
+          {{row.exceptionNumber || 0}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('待排单订单方数')" align="center" prop="warehousingNumber">

src/views/ecw/box/query.vue

@@ -6,9 +6,9 @@
           <h2>{{$t('出货详情')}}</h2>
           <div>
             <!-- <el-button size="small" @click="handleCommand('edit')">{{$t('编辑')}}</el-button> -->
-            <el-button size="small" @click="handleCommand('router')">{{$t('操作')}}</el-button>
-            <el-button type="primary" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
-            <el-button type="primary" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
+            <el-button size="small" v-hasPermi="['shipment:box:action:sea']" @click="handleCommand('router')">{{$t('操作')}}</el-button>
+            <el-button type="primary" v-hasPermi="['shipment:box:action:error']" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
+            <el-button type="primary" v-hasPermi="['shipment:box:action:cost']" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
             <!-- <el-button type="danger" size="small" @click="handleCommand('delete')">{{$t('删除')}}</el-button> -->
           </div>
         </div>
@@ -56,8 +56,8 @@
                 {{getSectionInfo}}
               </p>
               <div style="margin-left:30px;">
-                <el-button type="primary" size="small" @click="()=>updateStatus('selected')">{{$t('更新所选订单状态')}}</el-button>
-                <el-button type="primary" size="small" @click="()=>updateStatus('all')">{{$t('更新全部订单状态')}}</el-button>
+                <el-button type="primary" v-hasPermi="['shipment:box:order:select']" size="small" @click="()=>updateStatus('selected')">{{$t('更新所选订单状态')}}</el-button>
+                <el-button type="primary" v-hasPermi="['shipment:box:order:all']" size="small" @click="()=>updateStatus('all')">{{$t('更新全部订单状态')}}</el-button>
               </div>
               <div class="document-status">
                 <p>{{$t('单证状态')}}：</p>
@@ -176,7 +176,7 @@
               <el-table-column prop="title" :label="$t('文件类型')"></el-table-column>
               <el-table-column prop="" :label="$t('下载链接')">
                 <template slot-scope="scope">
-                  <a v-if="scope.row.serviceName" href="javascript:void(0)" @click="downloadDetailFile(scope.row)">{{$t('下载')}}</a>
+                  <a v-if="scope.row.serviceName" href="javascript:void(0)" @click="downloadDetailFile(scope.row)" v-hasPermi="[`${scope.row.hasPermi}`]">{{$t('下载')}}</a>
                   <div v-else>{{$t('未完成')}}</div>
                 </template>
               </el-table-column>
@@ -298,24 +298,27 @@ export default {
       costDetail: {},
       // 下载
       downloadList: [
-        { title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList" },
-        { title: this.$t("已装单"), serviceName: "downloadLoadGoodsList" },
-        { title: this.$t("应收汇总表"), serviceName: "downloadReceivableList" },
+        { title: this.$t("预装单"), serviceName: "downloadPreloadGoodsList", hasPermi: "shipment:box:download:downloadPreloadGoodsList" },
+        { title: this.$t("已装单"), serviceName: "downloadLoadGoodsList", hasPermi: "shipment:box:download:downloadLoadGoodsList" },
+        { title: this.$t("应收汇总表"), serviceName: "downloadReceivableList", hasPermi: "shipment:box:download:downloadReceivableList" },
         {
           title: this.$t("提货单"),
           serviceName: "zipDownload",
           fileFormat: "zip",
+          hasPermi: "shipment:box:download:zipDownload"
         },
         {
           title: "agent list",
           serviceName: "downloadAgentListFiles",
           type: "url",
+          hasPermi: "shipment:box:download:downloadAgentListFiles"
         },
-        { title: "soncap", serviceName: "downloadSoncapFiles", type: "url" },
+        { title: "soncap", serviceName: "downloadSoncapFiles", type: "url", hasPermi: "shipment:box:download:downloadSoncapFiles" },
         {
           title: this.$t("提单Copy"),
           serviceName: "downloadLadingCopy",
           type: "url",
+          hasPermi: "shipment:box:download:downloadLadingCopy"
         },
       ],
       // 选中行

src/views/ecw/financial/voucher.vue

@@ -234,8 +234,6 @@ export default {
       dateType: [],
       loading: "",
       params: {
-        page: 1,
-        rows: 20,
       },
       // 查询参数
       queryParams: {
@@ -273,7 +271,7 @@ export default {
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = { ...this.params };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
       getReceiptList(params).then((response) => {
@@ -324,6 +322,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.params = {}
       if(this.dateFilter&&this.dateFilter.length>0){
         this.queryParams.beginCreateTime = this.dateFilter[0]
         this.queryParams.endCreateTime = this.dateFilter[1]
@@ -333,6 +332,11 @@ export default {
       }
 
       this.queryParams.pageNo = 1;
+      for(var key in this.queryParams){
+          if(this.queryParams[key]){
+            this.params[key] = this.queryParams[key]
+          }
+         }
       this.getList();
     },
     /** 新增按钮操作 */

src/views/ecw/offer/detail.vue

@@ -6,11 +6,11 @@
           <div class="offer-header">
               <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
               <div class="btns">
-            <el-button size="mini" type="primary" v-if="list.status!=5"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
-                <el-button type="primary" v-if="[1,3,7].indexOf(list.status) > -1"  size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
-                <el-button type="primary"  v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
-                <el-button size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
-                <el-button type="danger" size="mini" @click="handleDelete">{{$t('删除')}}</el-button>
+                <el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="list.status!=5"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
+                <el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[1,3,7].indexOf(list.status) > -1"  size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
+                <el-button v-hasPermi="['ecw:offer:result']" type="primary"  v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
+                <el-button v-hasPermi="['ecw:offer:discount','ecw:offer:commission']" size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
+                <el-button v-hasPermi="['ecw:offer:delete']" type="danger" size="mini" @click="handleDelete">{{$t('删除')}}</el-button>
               </div>
           </div>
           <div>
@@ -290,7 +290,7 @@
                   {{list.competitor||'/'}}
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('重要程度')">
-                    <el-rate v-model="list.importance"></el-rate>
+                    <el-rate v-model="list.importance" disabled></el-rate>
                  </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="4">

src/views/ecw/offer/index.vue

@@ -126,7 +126,7 @@
               <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)"                                   v-if="[1,2,3,7].indexOf(scope.row.status) > -1"        v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)"                           v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:loglist']">{{$t('跟进')}}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:result']">{{$t('结果')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:discount','ecw:offer:commission',]">{{$t('特价')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:discount','ecw:offer:commission']">{{$t('特价')}}</el-dropdown-item>
               <el-dropdown-item @click.native="cancel(scope.row.offerId)"                                                      v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:cancel']">{{$t('取消')}}</el-dropdown-item>
               <el-dropdown-item @click.native="recovery(scope.row.offerId)"                                                    v-if="[0].indexOf(scope.row.status) > -1"              v-hasPermi="['ecw:offer:recovery']">{{$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>

src/views/ecw/order/cargoControl.vue

@@ -161,12 +161,12 @@ import CustomerSelector from '@/components/CustomerSelector'
 import Transfer from '@/views/ecw/order/components/Transfer'
 import Release from './components/Release'
 import CargoControlEdit from './components/CargoControlEdit'
-import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo } from "@/api/ecw/orderCargoControl"
+import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo, exportCargoControl } from "@/api/ecw/orderCargoControl"
 import TransferCargo from '@/views/ecw/order/components/TransferCargo'
 import Fallback from './components/Fallback'
 import {getWarehouseList} from '@/api/ecw/warehouse'
 export default {
-  name: "EcwOrderCargonControl",
+  name: "EcwOrderCargocontrol",
   components: {
     CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
   },
@@ -269,9 +269,9 @@ export default {
       // 执行导出
       this.$modal.confirm('是否确认导出所有订单数据项?').then(() => {
         this.exportLoading = true;
-        return exportOrderExcel(this.combinedQueryParams);
+        return exportCargoControl(this.combinedQueryParams);
       }).then(response => {
-        this.$download.excel(response, '${table.classComment}.xls');
+        this.$download.excel(response, this.$t('控货订单') + '.xlsx');
         this.exportLoading = false;
       }).catch(() => { });
     },

src/views/ecw/order/release.vue

@@ -22,7 +22,7 @@
             <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
           </el-form-item>
           <el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
-            <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            <el-date-picker v-model="form.pickTime" placeholder="" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
           </el-form-item>
 
           <template v-if="form.pickType == 2">
@@ -49,14 +49,14 @@
           <el-form-item :label="$t('附件')">
             <image-upload v-model="form.attachment" />
           </el-form-item>
-          
+
           <el-form-item :label="$t('备注')">
             <el-input v-model="form.remark" type="textarea" placeholder=""></el-input>
           </el-form-item>
           <el-form-item label="">
             <el-button type="primary" @click="submit">{{$t('确认放货')}}</el-button>
             <el-button type="default" @click="$router.back()">{{$t('取消')}}</el-button>
-          </el-form-item>          
+          </el-form-item>
         </el-form>
     </div>
 </template>
@@ -87,7 +87,8 @@ export default {
             getOrder(this.$route.query.orderId).then(res => {
                 this.order = res.data
                 this.$set(this.form, 'pickType', this.order.consigneeVO.harvestMethod)
-            })
+            });
+            this.form.pickTime = new Date().format('yyyy-MM-dd hh:mm:ss');
         },
         submit(){
             create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
@@ -98,4 +99,4 @@ export default {
         }
     }
 }
-</script>
+</script>
\ No newline at end of file

src/views/ecw/zhongPao/index.vue

@@ -194,10 +194,7 @@ export default {
     handleStatusChange(row){
       let text = row.status === CommonStatusEnum.ENABLE ? this.$t("启用") : this.$t("停用");
       this.$modal.confirm('确认要' + text + '吗?').then(function() {
-        return updateZhongPao({
-          id: row.id,
-          status: row.status
-        })
+        return updateZhongPao(row)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
@@ -207,7 +204,7 @@ export default {
     },
     departureFormatter(row, column, cellValue) {
       if (cellValue === 0) return this.$t('全部')
-      return this.warehouseList.find(e => e.id === cellValue)?.titleZh
+      return this.tradeCityList.find(e => e.id === cellValue)?.titleZh
     },
     objectiveFormatter(row, column, cellValue) {
       if (!cellValue || cellValue.length === 0) return ''