报价单导出，订单等的bug

src/api/ecw/offer.js

@@ -133,3 +133,13 @@ export function offerDeptPage(params) {
     params
   })
 }
+
+// 导出部分报价单 exportDeptOfferExcel
+export function exportDeptOfferExcel(query) {
+  return request({
+    url: '/ecw/offer/dept/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file

src/views/ecw/offer/index.vue

@@ -143,7 +143,7 @@
 </template>
 
 <script>
-import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery, offerDeptPage } from "@/api/ecw/offer";
+import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery, offerDeptPage, exportDeptOfferExcel } from "@/api/ecw/offer";
 import { getCurrencyList } from '@/api/ecw/currency';
 import {getTradeCityList} from '@/api/ecw/region'
 import UserSelector from '@/components/UserSelector'
@@ -260,7 +260,9 @@ export default {
       // 执行导出
       this.$modal.confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
           this.exportLoading = true;
-          return exportOfferExcel(params);
+          if(this.dept){
+            return exportDeptOfferExcel(params)
+          }else return exportOfferExcel(params);
         }).then(response => {
           this.$download.excel(response, '报价列表.xls');
           this.exportLoading = false;

src/views/ecw/order/components/PrintWarehouseReceipt.vue

@@ -24,6 +24,7 @@
                             <th style="text-align:center;padding:0 0px;width:80px;text-align: center;font-size: 14px;border:1px dashed #ccc;">{{$t('方数')}}</th>
                             <th style="text-align:center;padding:0 0px;width:80px;text-align: center;font-size: 14px;border:1px dashed #ccc;">{{$t('重量')}}</th>
                             <th style="text-align:center;padding:0 0px;width:110px;text-align: center;font-size: 14px;border:1px dashed #ccc;">{{$t('入仓时间')}}</th>
+                            <th v-if="!preview" style="text-align:center;padding:0 0px;width:110px;text-align: center;font-size: 14px;border:1px dashed #ccc;">{{$t('首次入仓时间')}}</th>
                         </tr>
                         <template v-for="(item, index) in items">
                         <tr v-if="!preview || item.checked"  :key="index">
@@ -53,6 +54,9 @@
                             <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;">
                                 {{item.inTime|parseTime}}
                             </td>
+                            <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;" v-if="!preview">
+                                {{item.createTime|parseTime}}
+                            </td>
                         </tr>
                         </template>
                     </table>
@@ -121,7 +125,8 @@ export default {
                         boxGauge: witem.boxGauge,
                         volume: witem.volume,
                         weight: witem.weight,
-                        inTime: witem.inTime
+                        inTime: witem.inTime,
+                        createTime: witem.createTime
                     })
                 })
             })

src/views/ecw/order/components/TransferCargo.vue

@@ -152,7 +152,16 @@ export default {
             if(!valid){
               return false
             }
-            console.log('submit')
+            // 放货箱数不能大于总控货箱数
+            let errNos = []
+            this.selectedOrders.forEach(item => {
+              if(item.releaseNum > item.sumNum){
+                errNos.push(item.orderNo)
+              }
+            })
+            if(errNos.length){
+              return this.$message.error(this.$t("订单{no}的放货箱数不能大于控货箱数", {no: errNos.join(",")}))
+            }
             updateApply(Object.assign({
               cargoControlPickId: this.cargoControlPickId,
               orderBackPageVOList: this.selectedOrders,