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

src/App.vue

@@ -46,6 +46,10 @@ export default  {
   align-items: center;
   justify-content: center;
 }
+.flex-between{
+  display: flex;
+  justify-content: space-between;
+}
 .empty-placeholder{
   padding: 50px;
   text-align: center;

src/api/ecw/customer.js

@@ -48,7 +48,9 @@ export function getCustomerPage(query) {
   return request({
     url: '/ecw/customer/page',
     method: 'get',
-    params: query
+    params: query,
+    timeout: 60000
+
   })
 }
 /**

src/api/ecw/indirectCustomer.js

@@ -25,7 +25,8 @@ export function getCustomerPage(query) {
   return request({
     url: '/ecw/indirect-customer/page',
     method: 'get',
-    params: query
+    params: query,
+    timeout: 30000
   })
 }
 

src/components/ProductSelector/index.vue

@@ -79,8 +79,10 @@ export default {
             if(index < 0){
                 getProduct(this.value).then(res => {
                     this.list.unshift(res.data)
+                    this.$nextTick(() => {
                         this.index = 0
                     })
+                })
             }else this.index = index
         },
         onFocus(){

src/components/WarehouseAreaSelect/index.vue

@@ -142,7 +142,8 @@ export default {
           if (f.selected) result.push({
             orderId: this.orderId,
             wareId: f.pid,
-            areaId: f.id
+            areaId: f.id,
+            locationName: f.code
           })
           else {
             f.positionList?.forEach(g => {
@@ -151,7 +152,8 @@ export default {
                 orderId: this.orderId,
                 wareId: g.domainId,
                 areaId: g.areaId,
-                locationId: g.id
+                locationId: g.id,
+                locationName: f.code + g.code
               })
               else g.children?.forEach(k => {
                 // 子位置
@@ -159,7 +161,8 @@ export default {
                   orderId: this.orderId,
                   wareId: k.domainId,
                   areaId: k.areaId,
-                  locationId: k.id
+                  locationId: k.id,
+                  locationName: f.code + k.code
                 })
               })
             })

src/views/bpm/processInstance/detail.vue

@@ -281,6 +281,11 @@ export default {
           component: "BoxSplitDetail",
           id: this.processInstance.businessKey,
         },
+        // 退场拆单，跟出货装柜拆单一样
+        customs_exit_part_split: {
+          component: "BoxSplitDetail",
+          id: this.processInstance.businessKey,
+        },
         merge_detail: {
           component: "MergeDetail",
           id: this.processInstance.businessKey,

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -279,6 +279,7 @@ export default {
         secId: this.partData.id,
         shipmentId: this.$attrs.shipmentObj.id,
         orderId: item.orderId,
+        isCover: 1
       };
       if (type === "all") {
         params.orderItemIdList = item.boxOrderItemList.map(

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -563,14 +563,24 @@ export default {
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
-        if (column.property === "brandType") {
+        if (column.property === "feeType") {
           sums[index] = this.$t("合计");
           return;
         }
-        if (column.property === "num") {
-          sums[index] = new Decimal(
-            this.calcSum(column.property, data)
-          ).toNumber();
+        if (column.property === "warehouseInInfoVO.cartonsNum") {
+          var num = 0
+          let values = data?.map((item) => Number(item.warehouseInInfoVO.cartonsNum)) ?? [];
+          if (!values.every((value) => isNaN(value))) {
+            num = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+               return prev;
+              }
+            }, 0);
+          }
+          sums[index] = num
         }
         if (column.property === "volumeWeight") {
           let volume = this.calcSum("volume", data);
@@ -653,6 +663,7 @@ export default {
           orderItemIdList: item.boxOrderItemList.map(
             (data) => data.orderItemId
           ),
+          isCover: 0
         };
 
         createGoods(params)

src/views/ecw/customer/customerLog.vue

@@ -72,10 +72,7 @@
          <dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="row.operateType"></dict-tag>
        </template>
      </el-table-column>
-     <el-table-column :label="$t('操作人')" prop="operator">
-        <template v-slot="{row}">
-          {{operatorFn(row.operator)}}
-        </template>
+     <el-table-column :label="$t('操作人')" prop="operatorName">
      </el-table-column>
      <el-table-column :label="$t('操作时间')" prop="operator">
         <template v-slot="{row}">
@@ -119,7 +116,7 @@
          <dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="dataLog.operateType"></dict-tag>
        </el-form-item>
        <el-form-item :label="$t('操作人')+':'">
-         {{operatorFn(dataLog.operator)}}
+         {{dataLog.operatorName}}
        </el-form-item>
        <el-form-item :label="$t('操作时间')+':'">
          {{parseTime(dataLog.createTime)}}

src/views/ecw/customer/edit.vue

@@ -948,7 +948,7 @@ export default {
     getCustomer(id) {
       return getCustomer(id).then(response => {
         console.log(response,'response')
-        this.form = { ...this.form, ...response.data, id: this.customerId,transportType:  response.data.transportType.split(','),customerBanks:response.data.customerBankBackVOList };
+        this.form = { ...this.form, ...response.data, id: this.customerId,transportType: response.data.transportType && response.data.transportType !== '' ?  response.data.transportType.split(',') : [],customerBanks:response.data.customerBankBackVOList };
         this.open = true;
         this.title = this.$t('修改客户');
         this.getZhongPao()

src/views/ecw/customer/index.vue

@@ -105,7 +105,8 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
         <template slot-scope="{row}">
-          {{$l(row, 'name')}} <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
+          <p style="display:inline-block;white-space:pre-wrap;">{{$l(row, 'name')}}</p>
+          <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
         </template>
       </el-table-column>
 

src/views/ecw/customer/query.vue

@@ -15,7 +15,7 @@
         <el-card style="margin-top: 15px;">
           <el-descriptions :column="4" border>
             <el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('客户名称')">{{ customer.name}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户名称')"><span style="white-space: pre-wrap;">{{ customer.name}}</span></el-descriptions-item>
             <el-descriptions-item :label="$t('客户英文名称')">{{customer.nameEn }}</el-descriptions-item>
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>

src/views/ecw/customerConfirm/index.vue

@@ -87,7 +87,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          {{$l(row, 'name')}}
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/customerToBeAssigned/index.vue

@@ -98,7 +98,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          {{$l(row, 'name')}}
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/myCustomerService/index.vue

@@ -87,7 +87,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          {{$l(row, 'name')}}
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/oceanCustomer/index.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          {{$l(row, 'name')}}
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/offer/detail.vue

@@ -6,7 +6,7 @@
           <div class="offer-header">
               <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
               <div class="btns">
-                <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:update']" size="mini" type="primary" v-if="[4,5,6].indexOf(list.status) == -1"  @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>

src/views/ecw/order/cargoControl.vue

@@ -91,7 +91,7 @@
       <el-table-column :label="$t('唛头')" align="center" prop="marks" />
       <el-table-column :label="$t('箱数')" align="center" prop="sumNum" >
         <template v-slot="{row}">
-          {{row.inWarehouseState > 1 ? row.sumNum : row.totalNum}}
+          {{row.sumNum > 0 ? row.sumNum : row.totalNum}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">

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

@@ -68,7 +68,7 @@
                 </el-table-column>
             </el-table>
         </template>
-      <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" append-to-body></warehouse-record>
+      <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" append-to-body @close="currentWarehouseRecord=null"></warehouse-record>
     </div>
 </template>
 <script>

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

@@ -37,7 +37,8 @@
                                 {{detail.marks}}
                             </td>
                             <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;">
-                                {{item.prodTitleZh}}<br/>{{item.prodTitleEn}}
+                              <div style="white-space: nowrap">{{item.prodTitleZh}}</div>
+                              <div style="white-space: nowrap">{{item.prodTitleEn}}</div>
                             </td>
                             <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;">
                                 {{item.cartonsNum}}

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

@@ -84,7 +84,7 @@
           <send-sms-code :order-id="detail.orderId" scene="5" />
         </el-form-item>
         <el-form-item label="" style="margin-top:20px">
-          <el-button type="success" @click="submit">{{$t('确认提货')}}</el-button>
+          <el-button type="success" @click="submit">{{$t('确认放货')}}</el-button>
           <el-button type="default" @click="closeDialog">{{$t('关闭')}}</el-button>
         </el-form-item>
       </el-form>

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

@@ -138,7 +138,8 @@ export default {
           getReleaseInfo(this.orderId).then(res => this.detail = res.data)
           seasoningCondimentsSelect({orderId: this.orderId}).then(res => {
             res.data.forEach(item => {
-              item.releaseNum = item.sumNum - item.releaseNum
+              item.release = item.releaseNum
+              item.releaseNum = item.sumNum - item.release
             })
             this.orders = res.data
           })
@@ -155,7 +156,7 @@ export default {
             // 放货箱数不能大于可放货箱数
             let errNos = []
             this.selectedOrders.forEach(item => {
-              if(item.releaseNum > item.sumNum - item.releaseNum){
+              if(item.releaseNum > item.sumNum - item.release){
                 errNos.push(item.orderNo)
               }
             })

src/views/ecw/order/splitApply/components/WarehouseRecord.vue

@@ -31,14 +31,19 @@
       </el-table-column>
       <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
-      <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
+      <el-table-column :label="$t('数量（个）')" prop="quantity" />
       <!--<el-table-column :label="$t('入仓快递单号')" prop="expressNo" />-->
       <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
       </el-table-column>-->
       <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
         <template slot-scope="{row}">
-          {{getLocationName(row.orderLocationBackVOList)}}
+          <!--{{getLocationName(row.orderLocationList)}}-->
+          <warehouse-area-select
+            v-model="row.orderLocationList"
+            readonly
+            :warehouse-id="warehouseId"
+            ></warehouse-area-select>
         </template>
       </el-table-column>
     </el-table>
@@ -46,13 +51,17 @@
 </template>
 
 <script>
+import WarehouseAreaSelect from "@/components/WarehouseAreaSelect/index.vue";
+
 export default {
   name: "WarehouseRecord",
+  components: {WarehouseAreaSelect},
   props:{
     list:{
       type: Array,
       default: []
     },
+    warehouseId: Number,
     appendToBody: Boolean
   },
   data(){

src/views/ecw/productBrank/index.vue

@@ -63,7 +63,7 @@
       </el-table-column>
       <el-table-column :label="$t('创建人')" align="center" prop="creator" width="180">
         <template v-slot="{row}">
-          {{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}}
+          {{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator) && allSimplList.find(i => i.id == row.creator).nickname}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -73,7 +73,7 @@
       </el-table-column>
       <el-table-column :label="$t('修改人')" align="center" prop="updater" width="180">
         <template v-slot="{row}">
-          {{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}}
+          {{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater) && allSimplList.find(i => i.id == row.updater).nickname}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180">