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

src/api/ecw/boxAir.js

@@ -80,7 +80,7 @@ export function createGoods(data) {
  */
 export function getMergePkgList(params) {
   return request({
-    url: "/ecw/box-merge-pkg/pager",
+    url: "/ecw/box-merge-pkg/page",
     method: "get",
     params,
   });
@@ -99,4 +99,63 @@ export function createMergePkg(data) {
     method: "post",
     data,
   });
+}
+
+/**
+ * 更新合包箱
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function updateMergePkg(data) {
+  return request({
+    url: "/ecw/box-merge-pkg/update",
+    method: "put",
+    data,
+  });
+}
+
+/**
+ * 删除合包箱
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function deleteMergePkg(id) {
+  return request({
+    url: `/ecw/box-merge-pkg/delete?id=`+id,
+    method: "delete",
+  });
+}
+
+/**
+ * 获得未装箱列表分页
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function getUnPkgPage(params) {
+  return request({
+    url: "/ecw/box-merge-pkg/getUnPkgPage",
+    method: "get",
+    params,
+  });
+}
+
+/**
+ * 获得已装箱列表分页
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function getPkgPageByPkgId(params) {
+  return request({
+    url: "/ecw/box-merge-pkg/getPkgPageByPkgId",
+    method: "get",
+    params,
+  });
 }
\ No newline at end of file

src/components/ProductSelector/index.vue

@@ -63,6 +63,10 @@ export default {
         value(val){
             // console.log('初始化内容', val)
             this.init()
+        },
+        // 类型变了，清空内容
+        productType(){
+            this.list = []
         }
     },
     created(){

src/components/RoutersSelector/index.vue

@@ -48,7 +48,7 @@
                                     {{$l(row, 'destTitle')}}
                                 </template>
                             </el-table-column>
-                            <el-table-column :label="$t('渠道')" prop="startTitleZh">
+                            <el-table-column :label="$t('渠道')" prop="startTitleZh" v-if="type == 'air'">
                                 <template slot-scope="{row}">
                                     {{$l(row.channel, 'name')}}
                                 </template>

src/utils/dict.js

@@ -200,6 +200,7 @@ export const DICT_TYPE = {
   ORDER_SPECIAL_NEEDS:'order_special_needs', // 订单特殊需求
   ORDER_ABNORMAL_STATE:'order_abnormal_state',
   TARGET_TYPE:'target_type',//部门业绩目标类型
+  CEBE_UNIT:'cube_unit',//目标单位
   RECEIPT_ITEM_STATE:'receipt_item_state',//收款单明细状态
   // ========== 出货模块 ==========
   BOX_SHIPPING_TRAILER_STATUS: 'shipping_trailer_status', // 拖车状态

src/views/ecw/box/indexAir.vue

@@ -168,12 +168,17 @@
 </template>
 
 <script>
-import { createbox, updatebox, deletebox, getbox, getboxPage, exportboxExcel } from '@/api/ecw/box'
+import { deletebox, getbox, getboxPage, exportboxExcel } from '@/api/ecw/box'
 import { getChannelList } from '@/api/ecw/channel'
 import { getWarehouseList } from '@/api/ecw/warehouse'
 import costForm from './costForm.vue'
 import regError from './regError.vue'
 import editAirForm from './editAirForm.vue'
+import {
+  downloadFile,
+  downloadFileByUrl,
+  formatDate,
+} from "./shippingAir/utils";
 
 export default {
   name: 'indexAir',
@@ -291,6 +296,7 @@ export default {
     this.getChannelList()
   },
   methods: {
+    formatDate,
     getChannelList() {
       getChannelList().then((res) => (this.channelList = res.data))
     },

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

+<template>
+  <div>
+    22
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

+<template>
+  <div>
+    11
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/ecw/deptTarget/myAchievement.vue

@@ -99,7 +99,7 @@
       <el-table-column :label="$t('重量')" align="center" prop="completeWeight"/>
       <el-table-column :label="$t('方数')" align="center" prop="completeVolume"/>
       <el-table-column :label="$t('下单时间')" align="center" prop="createTime"/>
-      <el-table-column :label="$t('装柜时间')" align="center" prop="ldBoxTime"/>
+      <el-table-column :label="$t('业绩创建时间')" align="center" prop="ldBoxTime"/>
       <el-table-column :label="$t('客户经理')" align="center" prop="userId" :formatter="customerServiceFn">
       </el-table-column>
     </el-table>

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -98,7 +98,7 @@
       <el-table-column :label="$t('重量')" align="center" prop="completeWeight"/>
       <el-table-column :label="$t('方数')" align="center" prop="completeVolume"/>
       <el-table-column :label="$t('下单时间')" align="center" prop="createTime"/>
-      <el-table-column :label="$t('装柜时间')" align="center" prop="ldBoxTime"/>
+      <el-table-column :label="$t('业绩创建时间')" align="center" prop="ldBoxTime"/>
       <el-table-column :label="$t('客户经理')" align="center" prop="userId" :formatter="customerServiceFn">
       </el-table-column>
     </el-table>

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -124,8 +124,11 @@
                        :key="item.channelId"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('立方数')" prop="cubeNum">
-          <el-input v-model="form.cubeNum" :placeholder="$t('请输入立方数')"/>
+        <el-form-item :label="$t('目标值')" prop="cubeNum">
+          <el-input v-model="form.cubeNum" :placeholder="$t('请输入目标值')"/>
+        </el-form-item>
+        <el-form-item :label="$t('目标单位')" prop="cubeUnit">
+          <dict-selector :type="DICT_TYPE.CEBE_UNIT" v-model="form.cubeUnit" :placeholder="$t('请选择目标单位')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/ecw/order/edit.vue

@@ -931,6 +931,9 @@ export default {
       if(updateChannel){
         this.$set(this, 'showWorkFlow', true)
       }
+    },
+    '$route.query.transportType'(transportType){
+      this.$set(this.form, 'transportId', +transportType)
     }
   },
   activated(){

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

@@ -164,7 +164,7 @@
           <span style="font-size: 18px">{{$t('入仓影像')}}</span>
         </div>
         <div>
-          <image-and-video-upload readonly :fileSize="50" :isShowTip="true" :value="[...form.urls, ...this.orderItemList.map(e => e.pictureUrls).flat()]" ></image-and-video-upload>
+          <image-and-video-upload readonly :fileSize="50" :isShowTip="true" :value="[...form.urls, ...this.orderItemList.map(e => e.pictureUrls || []).flat()]" ></image-and-video-upload>
         </div>
       </el-card>
       <div style="text-align: center;margin-top: 15px" v-if="!(order.status !== 3 && isEdit)">

src/views/ecw/productPrice/edit.vue

@@ -777,19 +777,24 @@ export default {
           }
         }else{
           // 全包价 的阶段 设置和运费（全包价）不能为空
-          let stepPriceEmpty = false
-          this.form.priceStepList.forEach(item => {
-            let notEmptyFields = ['startNum', 'endNum', 'weightUnit']
+          let stepPriceEmpty = []
+          this.form.priceStepList.forEach((item, index) => {
+            let notEmptyFields = ['endNum', 'weightUnit']
+            // 第一条阶梯的起始值可以是0，其他的不能为0
+            if(index){
+              notEmptyFields.push('startNum')
+            }
             notEmptyFields.forEach(field => {
               if(!item[field] || item[field].toString().trim() == ''){
-                stepPriceEmpty = true
+                stepPriceEmpty.push({index, field})
               }
             })
             if((this.form.priceType == 0 && !item.transportPrice) || (this.form.priceType == 1 && !item.allPrice)){
-              stepPriceEmpty = true
+              stepPriceEmpty.push({index, field: !item.transportPrice ? 'transportPrice' : 'allPrice'})
             }
           })
-          if(stepPriceEmpty){
+          if(stepPriceEmpty.length){
+            console.log('stepPriceEmpty', stepPriceEmpty)
             return this.$message.error(this.$t('阶梯和价格设置不能留空'))
           }
         }
@@ -813,7 +818,7 @@ export default {
           this.loading = true
           return updateProductPrice(data).then(res => {
             this.$modal.msgSuccess(this.$t("请求成功"));
-            this.$router.back()
+            this.$tab.closePage()
           }).finally(res => this.loading = false)
         }
 

src/views/ecw/productPrice/index.vue

@@ -12,11 +12,11 @@
             <el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('运输方式')" prop="transportType">
+        <el-form-item :label="$t('运输方式')" prop="transportType" v-if="!transportType">
           <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable />
         </el-form-item>
         <!--海运不显示渠道-->
-        <el-form-item :label="$t('出货渠道')" prop="shippingChannelId" v-if="type == 'sea'">
+        <el-form-item :label="$t('出货渠道')" prop="shippingChannelId" v-if="type == 'air'">
         <el-select v-model="queryParams.shippingChannelId" clearable>
           <el-option v-for="item in channelList" :key="item.id" :label="$l(item, 'name')" :value="item.channelId" />
         </el-select>
@@ -732,7 +732,7 @@ export default {
     },
     // 批量修改单个商品的价格（一条或者多条，后者全部路线）
     batchSetSingleProductPrice(type){
-        this.$router.push(`../../lineProject/product-price/edit?action=batchUpdate&type=${type}&product_id=${this.$route.query.product_id}&ids=${this.ids}`)
+        this.$router.push(`../../lineProject/product-price/edit-${type}?action=batchUpdate&type=${type}&product_id=${this.$route.query.product_id}&ids=${this.ids}`)
     },
     // 批量设置路线
     handleBatchEdit(type) {