空运的部分bug

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>
+</style>
\ No newline at end of file

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>
+</style>
\ No newline at end of file

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/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/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/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/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();
     },
     /** 重置按钮操作 */