Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/customer.js

@@ -197,7 +197,7 @@ export function customerCreditLogPage(params){
 //客户详情订单分页
 export function infoListOrderPage(params){
   return request({
-    url:'/customer/detail/infoList/orderPage',
+    url:'/ecw/order/customer-order-page',
     method:'get',
     params
   })
@@ -293,4 +293,12 @@ export function getApproval(id) {
     method: 'get',
     params: {id}
   })
-}
\ No newline at end of file
+}
+//调入公海池
+export function testEnterToOpenSea(customerId) {
+  return request({
+    url: '/ecw/customer/test-enter-to-open-sea',
+    method: 'get',
+    params: {customerId}
+  })
+}

src/api/ecw/customerFollow.js

@@ -42,6 +42,13 @@ export function getCustomerFollowPage(query) {
     params: query
   })
 }
+export function getCustomerFollowPage2(query) {
+  return request({
+    url: '/ecw/customer-follow/page',
+    method: 'get',
+    params: query
+  })
+}
 
 // 导出跟进 Excel
 export function exportCustomerFollowExcel(query) {

src/components/CustomerFollow/index.vue

@@ -47,9 +47,8 @@
       >
       </el-table-column>
       <el-table-column
-        prop="followUserId"
-        label="跟进业务"
-        :formatter="(row, column, cellValue) => serviceUserList.find(e => e.id === cellValue) ? serviceUserList.find(e => e.id === cellValue).nickname : ''"
+        prop="followUserName"
+        label="客户经理 "
       >
       </el-table-column>
     </el-table>
@@ -87,7 +86,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跟进业务" required>
+            <el-form-item label="客户经理" required>
               <el-select v-model="customerFollow.form.followUserId" placeholder="请选择">
                 <el-option
                   v-for="item in serviceUserList"
@@ -124,7 +123,7 @@
 </template>
 
 <script>
-import {createCustomerFollow, getCustomerFollowPage} from "@/api/ecw/customerFollow"
+import {createCustomerFollow, getCustomerFollowPage, getCustomerFollowPage2} from "@/api/ecw/customerFollow"
 import { DICT_TYPE, getDictDataLabel } from '@/utils/dict'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
 import {listServiceUser} from "@/api/system/user"
@@ -235,9 +234,17 @@ export default {
        this.$refs.dictMethod.changeValue(this.customerFollow.form.followMethod);
     },
     getCustomerFollowList() {
+    if(this.$route.name === 'customerQuery'){
       getCustomerFollowPage({customerId: this.customerId,pageNo:this.pageNo,pageSize:this.pageSize}).then(r => {
-        this.customerFollowList = r.data.list
+        this.customerFollowList = r.data.list;
+        this.total = r.data.total;
       })
+    }else {
+      getCustomerFollowPage2({bizId: this.id,pageNo:this.pageNo,pageSize:this.pageSize}).then(r => {
+        this.customerFollowList = r.data.list;
+        this.total = r.data.total;
+      })
+    }
     }
 
   }

src/views/ecw/box/ladingBill/index.vue

@@ -16,7 +16,8 @@
               <div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
                 <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
                 <p>{{$t('品牌')}}：【
-                  <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
+                  <span v-if="item.feeType === 0">无品牌</span>
+                  <dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
                   】
                 </p>
                 <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -55,6 +55,8 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["ulWarehouseTime", "ulBoxTime"]);
     this.unloadingObj = oldData;
+    // 进入卸柜，仓库给了默认值为0，并且底下显示无匹配数据。应该默认为空，让手动去选择
+    if(this.unloadingObj.ulOutletsId === 0) this.unloadingObj.ulOutletsId = ''
     getNodePage({ pageNo: 1, pageSize: 1000, status: 0 }).then((res) => {
       const { data } = res;
       this.nodes = data?.list ?? [];

src/views/ecw/customer/edit.vue

@@ -661,7 +661,7 @@ export default {
             return
           }
 
-          const form = {...this.form, type: this.form.type?.join(','), transportType: this.form.transportType?.join(','), taxRate: Number(this.form.taxRate)}
+          const form = {...this.form, type: this.form.type?.join(','), transportType: (this.form.transportType || [])?.join(','), taxRate: Number(this.form.taxRate)}
 
           // 检查路线是否启用了但是没选择目的仓
           let errors = 0
@@ -720,6 +720,7 @@ export default {
         level: 1,
         country: undefined,
         type: undefined,
+        transportType:[],
         agentId: undefined,
         company: undefined,
         address: undefined,

src/views/ecw/customer/index.vue

@@ -127,6 +127,8 @@
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" v-show="'development' === env"  @click="seasPond(scope.row)"
+                     v-hasPermi="['ecw:customer:query']">{{$t('掉入公海池')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
                      v-hasPermi="['ecw:customer:query']">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -496,8 +498,10 @@
 </template>
 
 <script>
-import { createCustomer, updateCustomer, deleteCustomer, getCustomer,
-  getCustomerPage, exportCustomerExcel } from "@/api/ecw/customer";
+import {
+  createCustomer, updateCustomer, deleteCustomer, getCustomer,
+  getCustomerPage, exportCustomerExcel, testEnterToOpenSea
+} from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import {CommonStatusEnum} from '@/utils/constants'
 import { uploadFile } from "@/api/infra/file";
@@ -521,6 +525,7 @@ export default {
   },
   data() {
     return {
+      env:process.env.NODE_ENV,
       getDictDatas,
       DICT_TYPE,
       // 遮罩层
@@ -699,6 +704,15 @@ export default {
     handleView(row) {
       this.$router.push('/customer/query/' + row.id)
     },
+    /** 调入公海池测试用 */
+    seasPond(row) {
+      testEnterToOpenSea(row.id).then(r => {
+         if(r.code === 0){
+           this.$t('调入公海池成功！')
+           this.getList();
+         }
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.$router.push('/customer/edit/' + row.id)

src/views/ecw/order/batchSingleApplication.vue

@@ -79,7 +79,7 @@
       <el-row style="margin-top: 30px">
         <el-col :span="8">
           <div style="text-align: right;">
-            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] ? [14,16].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
+            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] ? [14,16,15].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
           </div>
         </el-col>
         <el-col :span="3"><div style="text-align:center">
@@ -223,8 +223,7 @@ export default {
     getOrderListFn() {
       getOrderPage({orderIdList: this.orderList}).then(r => {
         this.list = r.data.list
-        console.log(this.list,'this.list[0].startWarehouseId');
-        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId :[14,16].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
+        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId :[14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
         adjustLastWithStatus({orderId:this.list[0].orderId,lang:0}).then(r =>{
           this.applyStatus = r.data
           if(r.data?.orderWarehouseAdjustBackVO?.status === 1){
@@ -236,7 +235,7 @@ export default {
     submit() {
       let p = this.list.map(e => e.orderId).join(',');
       this.params.orderIds = p;
-      this.params.warehouseOutId = this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : this.list[0].startWarehouseId;
+      this.params.warehouseOutId = this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : [14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId;
       this.params.orderNo = this.list[0].orderNo
       orderWarehouseInAdjustApply(this.params).then(r => {
         if (r.code === 0) {