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

src/views/ecw/box/indexAir.vue

@@ -129,7 +129,7 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="downloadPreloadGoodsList" v-hasPermi="['shipment:box:download:downloadPreloadGoodsList']">{{$t('预装单')}}</el-dropdown-item>
-              <el-dropdown-item command="downloadLoadGoodsList" v-hasPermi="['shipment:box:download:downloadLoadGoodsList']">{{$t('已装单')}}</el-dropdown-item>
+              <!--el-dropdown-item command="downloadLoadGoodsList" v-hasPermi="['shipment:box:download:downloadLoadGoodsList']">{{$t('已装单')}}</el-dropdown-item-->
               <el-dropdown-item command="downloadReceivableList" v-hasPermi="['shipment:box:download:downloadReceivableList']">{{$t('应收汇总表')}}</el-dropdown-item>
               <el-dropdown-item command="downloadAgentListFiles" v-hasPermi="['shipment:box:download:downloadAgentListFiles']">agent list</el-dropdown-item>
               <el-dropdown-item command="downloadSoncapFiles" v-hasPermi="['shipment:box:download:downloadSoncapFiles']">soncap</el-dropdown-item>

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

@@ -198,9 +198,9 @@ export default {
       this.isMergeEdit = true
       this.addMergedialogVisible = true
       this.addMergeForm.pkgNum = row.pkgNum
-      this.addMergeForm.pkgLength = row.pkgLength
-      this.addMergeForm.pkgWidth = row.pkgWidth
-      this.addMergeForm.pkgHight = row.pkgHight
+      this.addMergeForm.pkgLength = +row.pkgLength
+      this.addMergeForm.pkgWidth = +row.pkgWidth
+      this.addMergeForm.pkgHight = +row.pkgHight
       this.addMergeForm.id = row.id
     },
     addMerge() {
@@ -266,4 +266,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

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

@@ -93,7 +93,7 @@ export default {
   methods: {
     getList() {
       getUnPkgPage(this.queryParams).then((res) => {
-        this.pagList = res.data.list
+        this.pagList = res.data.list || []
         this.total = res.data.total
       })
     },
@@ -155,4 +155,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

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

@@ -70,14 +70,14 @@
           <p>{{$t('自编号')}}：</p>
           <p>{{shipmentObj.selfNo}}</p>
         </div>
-        <div>
+        <!--<div>
           <p>{{$t('柜号')}}：</p>
           <p>{{shipmentObj.cubNo}}</p>
-        </div>
-        <div>
+        </div>-->
+        <!--<div>
           <p>{{$t('容量')}}：</p>
           <p>{{calcCapacity}}</p>
-        </div>
+        </div>-->
         <div>
           <p>{{$t('始发地')}}：</p>
           <p>{{importCityName(shipmentObj.startWarehouseId)}}</p>
@@ -106,13 +106,13 @@
               <p>{{$t('总计')}}：</p>
               <p>{{getTotlContent(preList.loadStatistics)}}</p>
             </div>
-            <div class="red-label">
+            <!--<div class="red-label">
               <p>{{$t('可分拣方数')}}：</p>
               <p>{{preList.remainVolume}}m³</p>
-            </div>
+            </div>-->
             <div class="red-label">
               <p>{{$t('重量')}}：</p>
-              <p>{{preList.remainWeight}}kg</p>
+              <p>{{preList.remainWeight || 0}}kg</p>
             </div>
             <div class="table-button">
               <el-button type="success" size="small" @click="addPart" :disabled="isAudit">{{$t('增加')}}</el-button>
@@ -570,7 +570,7 @@ export default {
         this.relationOrderListDialog.visible = true
         this.relationOrderListDialog.data = res.msg.replace(/\n/g,'<br>')
       })
-      
+
     },
     /** 搜索按钮操作 */
     handleQuery(type) {
@@ -746,7 +746,7 @@ export default {
                   this.queryAllData();
                 });
             }
-            
+
             if (res.code === 566) {
               this.$confirm(res.msg+this.$t('是否需要一起分拣?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,

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

@@ -59,6 +59,12 @@ export default {
         if(this.order && this.orderItemId){
           this.queryParams.orderId = this.order.orderId;
           this.queryParams.orderItemId = this.orderItemId;
+          this.getList()
+        }
+
+    },
+    methods:{
+      getList(){
           orderItemPackLogPage(this.queryParams).then(res => {
             this.packData = []
             this.$nextTick(() => {
@@ -66,12 +72,6 @@ export default {
             })
             this.total = res.data.total;
           })
-        }
-
-    },
-    methods:{
-      getList(){
-
       },
       closeDialog(){
           this.show = false

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

@@ -6,12 +6,13 @@
             <el-descriptions-item :label="$t('品名')">{{orderItem.prodTitleZh}}</el-descriptions-item>
             <el-descriptions-item :label="$t('英文品名')">{{orderItem.prodTitleEn}}</el-descriptions-item>
             <el-descriptions-item :label="$t('品牌')" >
-              <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="orderItem.brandType" />
+                <template v-if="orderItem.brandName">{{orderItem.brandName}}</template>
+                <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="orderItem.brandType" />
             </el-descriptions-item>
             <el-descriptions-item :label="$t('箱数')">{{orderItem.num+$t('箱')}}</el-descriptions-item>
             <el-descriptions-item :label="$t('体积')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.volume : orderItem.volume}}m³</el-descriptions-item>
             <el-descriptions-item :label="$t('重量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.weight : orderItem.weight}}kg</el-descriptions-item>
-            <el-descriptions-item :label="$t('重量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.quantityAll : orderItem.quantity}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('数量')">{{orderItem.warehouseInInfoVO ? orderItem.warehouseInInfoVO.quantityAll : orderItem.quantity}}</el-descriptions-item>
             <el-descriptions-item :label="$t('备货状态')">{{airShipmentData[info.airShipment]}}</el-descriptions-item>
             <el-descriptions-item :label="$t('商品特性')">{{productAttr}}</el-descriptions-item>
           </el-descriptions>
@@ -172,10 +173,13 @@ export default {
         return JSON.parse(this.packAfterData.orderWarehouseInContent)
       },
       productAttr(){
-        if(this.productAttrList.length==0||!this.orderItem.prodAttrIds) return ''
-        var data = []
+        if(this.productAttrList.length==0||!this.orderItem.warehouseInProdAttrIds) return ''
+        let data = []
+          // 要拆分成数组再用indexOf，字符串直接indexOf会有问题，"12,3".indexOf('1') > -1 为true
+        let warehouseInProdAttrIds = this.orderItem.warehouseInProdAttrIds.split(',')
+          console.log({warehouseInProdAttrIds})
         this.productAttrList.forEach(item=>{
-          if(this.orderItem.prodAttrIds.indexOf(item.id)>-1){
+          if(warehouseInProdAttrIds.indexOf(`${item.id}`)>-1){
             data.push(this.$l(item, 'attrName'))
           }
         })

src/views/ecw/order/edit.vue

@@ -85,7 +85,7 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('运输方式')" prop="transportId">
-                    <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" :disabled2="inWarehouse"/>
+                    <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number" :disabled2="inWarehouse"/>
                 </el-form-item>
 
                 <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'">
@@ -868,8 +868,9 @@ export default {
     },
     'form.transportId'(transportId, oldTransportId){
         // 空运
-        if(this.form.transportId == 4 || this.form.transportId == 3){
+        if(!this.initing && (this.form.transportId == 4 || this.form.transportId == 3)){
             this.$nextTick(() => {
+                connsole.log('切换空运，修改默认值')
                 this.$set(this, 'form', Object.assign(this.form, {
                     doubleClear: 2,
                     customsClearCert: false,
@@ -1141,8 +1142,11 @@ export default {
                     if(res.data.deliveryWay){
                         this.$set(this.form, 'deliveryWay', res.data.deliveryWay)
                     }
+                    this.$nextTick(() => {
+                        this.initing = false
+                    })
                 }, 100)
-                this.initing = false
+
             })
 
           console.log('order数据加载成功')

src/views/ecw/order/index.vue

@@ -287,7 +287,9 @@
 
                 <!-- 费用申请 -->
                 <template v-if="
-                  exclude(scope.row.status, [0, 88]) && exclude(scope.row.inWarehouseState, [204,205,206])
+                  exclude(scope.row.status, [0, 88]) &&
+                  exclude(scope.row.inWarehouseState, [204,205,206]) &&
+                  exclude(scope.row.abnormalState, [1])
                   ">
                   <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" v-hasPermi="['ecw:order:fee_apply']" >{{$t('费用申请')}}</el-dropdown-item>
                 </template>
@@ -306,7 +308,7 @@
                 <!-- 特价 -->
                 <template v-if="
                   exclude(scope.row.status, [0]) &&
-                  // exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
+                  exclude(scope.row.abnormalState, [1]) &&
                   exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <!-- 特价里有多个操作，只要有其一权限就显示此菜单 -->
@@ -323,7 +325,8 @@
                 <template v-if="
                   scope.row.status >= 5 &&
                   exclude(scope.row.inWarehouseState, [1,99,2,3,4,9,10,11,12,14]) &&
-                  exclude(scope.row.inWarehouseState, [204,205,206])
+                  exclude(scope.row.inWarehouseState, [204,205,206]) &&
+                  exclude(scope.row.abnormalState, [1])
                   ">
                   <el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" v-hasPermi="['ecw:order:release']">{{$t('确认提货')}}</el-dropdown-item>
                 </template>

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

@@ -336,7 +336,7 @@ export default {
     // 显示打包弹层
     package(row, title = null){
       this.packageOrderItem = row
-      this.packageWarehouseItem = this.orderItemList.find(item => item.orderItemId = row.orderItemId)
+      this.packageWarehouseItem = this.orderItemList.find(item => item.orderItemId === row.orderItemId)
       this.packageTitle = title || this.$t('打包')
     },
     // 无需打包

src/views/ecw/order/stockingList.vue

@@ -348,7 +348,8 @@ export default {
     // 导出
     exportXls(params){
       this.exporting = true
-      exportCanShipment(params).then(res => {
+        const exportParams = Array.isArray(params) ? {orderIdList: params} : {...params}
+      exportCanShipment(exportParams).then(res => {
         // this.$download.excel(res, this.$t('备货订单') + '.xls');
           this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
       }).finally(() => {

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -837,7 +837,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
-              warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
+              warehouseInProdAttrIds: this.form1.warehouseInProdAttrIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,

src/views/ecw/productPrice/batchEdit.vue

@@ -350,7 +350,9 @@ export default {
           priceType,
           stepPrice,
           specialList,
-          priceStepList
+          priceStepList,
+            minWeight,
+            minWeightUnit
         } = res.data
 
         this.$set(this, 'form', Object.assign({}, this.form, {

src/views/ecw/productPrice/edit.vue

@@ -443,7 +443,7 @@ export default {
     currencyAndUnit(){
       let currency = null, unit = null, fields = null
       // 如果是阶梯价格则取第一阶梯,否则就取form中的字段
-      let obj = this.form.stepPrice == 1 ? this.form.priceStepList[0] : this.form
+      let obj = this.form.stepPrice == 1 ? (this.form.priceStepList[0] || {}) : this.form
       // 全包价
       if(this.form.priceType == 1){
         currency = obj.allPriceUnit
@@ -508,7 +508,7 @@ export default {
       this.syncAllUnit()
     },
     'form.minWeightUnit'(minWeightUnit){
-      console.log('最小其计量单位', minWeightUnit)
+      console.log('最小起计量单位', minWeightUnit)
     },
     'form.transportVolumeUnit'(transportVolumeUnit){
       // 最小其计量
@@ -629,6 +629,7 @@ export default {
         advanceStatus: 0,
         needBook: 0,
         specialList: [],
+        priceStepList: this.type === 'air' ? [{},{}] : [],
         // dayLimit: 10000,
         validateEndDate: undefined,
         validateStartDate: undefined,
@@ -639,10 +640,17 @@ export default {
         // 是否单询，默认否
         needOrderInquiry: 0
       }
-      // 默认体积单位（立方米）
-      this.setDefaultVolumeUnit(7)
-      // 默认货币单位（美元）
-      this.setDefaultPriceUnit(1)
+      this.$nextTick(() => {
+          // 默认体积单位，空运为千克，海运为立方米
+          this.setDefaultVolumeUnit(this.type === 'air' ? 6 : 7)
+          // 默认货币单位（美元）
+          this.setDefaultPriceUnit(1)
+
+          // 空运默认的阶梯重量单位是千克
+          if(this.type === 'air'){
+              this.$set(this.form.priceStepList[0], 'weightUnit', 6)
+          }
+      })
       this.form.validateStartDate = parseTime(Date.now())
       this.form.validateEndDate = parseTime(Date.now() + 86400*365*2*1000)
 
@@ -678,21 +686,6 @@ export default {
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
 
-    /* if(!this.form.specialList || !this.form.specialList.length){
-      console.log('specialList默认给[]')
-      this.$set(this.form, 'specialList', [])
-      this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
-        this.form.specialList.push({
-          "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-          "clearancePriceUnit": null,
-          "clearanceVolumeUnit": null,
-          "specialDictType": item.value,
-          "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-          "transportPriceUnit": null,
-          "transportVolumeUnit": null,
-        })
-      })
-    } */
     this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
       if(!this.form.specialList.find(special => special.specialDictType == item.value)){
         this.form.specialList.push({
@@ -705,7 +698,6 @@ export default {
           "transportVolumeUnit": null,
         })
       }
-
     })
 
   },
@@ -733,7 +725,7 @@ export default {
       if(this.form.stepPrice == 1){
         fields['weightUnit'] = obj.weightUnit
       }
-
+      console.log('-> 同步特需单位', fields)
       this.syncSpecialUnit(fields)
     },
     // 同步特需的货币单位和体积单位
@@ -746,7 +738,7 @@ export default {
       })
 
       // 如果是阶梯价则需要同步其他阶梯
-      if(this.form.stepPrice == 1){
+      if(this.form.stepPrice == 1 && this.form.priceStepList){
         this.form.priceStepList.forEach((item, index) => {
           this.$set(this.form.priceStepList, index, Object.assign(item, obj))
         })
@@ -766,11 +758,13 @@ export default {
       callback()
     },
     setDefaultVolumeUnit(unit){
+      console.log('设置默认体积单位', unit)
       this.$set(this.form, 'transportVolumeUnit', unit)
       this.$set(this.form, 'clearanceVolumeUnit', unit)
       this.$set(this.form, 'allVolumeUnit', unit)
     },
     setDefaultPriceUnit(priceUnit){
+      console.log('设置默认价格单位', priceUnit)
       this.$set(this.form, 'transportPriceUnit', priceUnit)
       this.$set(this.form, 'clearancePriceUnit', priceUnit)
       this.$set(this.form, 'allPriceUnit', priceUnit)

src/views/ecw/productPrice/index.vue

@@ -230,8 +230,8 @@
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['ecw:product-price:delete']">{{$t('删除')}}</el-button>
           <el-button @click="copyTemplate(scope.row)" size="mini" type="text">复制模板</el-button>
-          <el-button @click="setOrderInquiry(scope.row, 0)" v-if="scope.row.needOrderInquiry" size="mini" type="text">取消単询</el-button>
-          <el-button @click="setOrderInquiry(scope.row, 1)" v-else size="mini" type="text">加入単询</el-button>
+          <el-button @click="setOrderInquiry(scope.row, 0)" v-if="scope.row.needOrderInquiry" size="mini" type="text">取消单询</el-button>
+          <el-button @click="setOrderInquiry(scope.row, 1)" v-else size="mini" type="text">单询异常</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/system/download/index.vue

@@ -47,7 +47,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
   </div>
@@ -69,8 +69,8 @@ export default {
       total: 0,
       list: [],
       queryParams: {
-        pageNo: 1,
-        pageSize: 10
+        page: 1,
+        rows: 10
       }
     };
   },
@@ -87,6 +87,8 @@ export default {
               console.log({res})
               this.$download.download0(res.data, row.name + row.fileSuffix, res.headers['content-type'])
           }).finally(() => {
+              // 刷新列表状态
+              this.getList()
               loading.close()
           })
       },
@@ -104,7 +106,7 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */