Merge remote-tracking branch 'origin/release' 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
   })
 }
 
@@ -53,4 +54,4 @@ export function deleteIndirectCustomer(id) {
     url: '/ecw/indirect-customer/delete?id=' + id,
     method: 'delete'
   })
-}
\ No newline at end of file
+}

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

@@ -653,6 +653,7 @@ export default {
           orderItemIdList: item.boxOrderItemList.map(
             (data) => data.orderItemId
           ),
+          isCover: 0
         };
 
         createGoods(params)

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/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)
               }
             })
@@ -172,7 +173,7 @@ export default {
               this.$emit('success')
             })
           })
-          
+
 
         }
     }
@@ -192,4 +193,4 @@ export default {
     margin-right:10px;
   }
 }
-</style>
\ No newline at end of file
+</style>

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">