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

src/views/ecw/box/editSeaAirForm.vue

@@ -96,16 +96,14 @@ export default {
         if (this.form.id != null) {
           updatebox(this.form).then((response) => {
             this.$modal.msgSuccess('修改成功')
-            this.open = false
-            this.getList()
+            this.$emit("closeDialog", "edit");
           })
           return
         }
         // 添加的提交
         createbox(this.form).then((response) => {
           this.$modal.msgSuccess('新增成功')
-          this.open = false
-          this.getList()
+          this.$emit("closeDialog", "edit");
         })
       })
     },

src/views/ecw/box/indexSea.vue

@@ -124,7 +124,7 @@
               <el-dropdown-item command="error">异常登记</el-dropdown-item>
               <el-dropdown-item command="cost">费用登记</el-dropdown-item>
               <el-dropdown-item command="delete">删除</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.ldStatus==47" command="editLadingBill">编辑提货单</el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.ldStatus>42" command="editLadingBill">编辑提货单</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/indexSeaAir.vue

@@ -149,7 +149,11 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="自编号" align="center" prop="selfNo" />
+      <el-table-column label="自编号" align="center" prop="selfNo">
+        <template slot-scope="scope">
+          <a href="javascript:void(0)" @click="handleCommand(scope.row, 'detail')">{{ scope.row.selfNo }}</a>
+        </template>
+      </el-table-column>
       <el-table-column label="柜号" align="center" prop="cubNo" />
       <el-table-column label="柜型" align="center" prop="cabinetId">
         <template slot-scope="scope">
@@ -224,21 +228,21 @@
               <el-dropdown-item command="error">异常登记</el-dropdown-item>
               <el-dropdown-item command="cost">费用登记</el-dropdown-item>
               <el-dropdown-item command="delete">删除</el-dropdown-item>
-              <el-dropdown-item command="editLadingBill">编辑提货单</el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.ldStatus>42" command="editLadingBill">编辑提货单</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-dropdown trigger="click">
+          <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">
             <el-button type="primary">
               下载<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="">预装单</el-dropdown-item>
-              <el-dropdown-item command="">已装单</el-dropdown-item>
-              <el-dropdown-item command="">应收汇总表</el-dropdown-item>
-              <el-dropdown-item command="">agent list</el-dropdown-item>
-              <el-dropdown-item command="">son cap</el-dropdown-item>
-              <el-dropdown-item command="">提货单</el-dropdown-item>
-              <el-dropdown-item command="">提单Copy</el-dropdown-item>
+              <el-dropdown-item command="downloadPreloadGoodsList">预装单</el-dropdown-item>
+              <el-dropdown-item command="downloadLoadGoodsList">已装单</el-dropdown-item>
+              <el-dropdown-item command="downloadReceivableList">应收汇总表</el-dropdown-item>
+              <el-dropdown-item command="downloadAgentListFiles">agent list</el-dropdown-item>
+              <el-dropdown-item command="downloadSoncapFiles">soncap</el-dropdown-item>
+              <el-dropdown-item command="zipDownload">提货单</el-dropdown-item>
+              <el-dropdown-item command="downloadLadingCopy">提单Copy</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -304,6 +308,11 @@ import {
   getboxPage,
   exportboxExcel
 } from '@/api/ecw/box'
+import {
+  downloadFile,
+  downloadFileByUrl,
+  formatDate,
+} from "./shippingSea/utils";
 import { getCabinetPage } from '@/api/ecw/cabinet'
 import { getChannelList } from '@/api/ecw/channel'
 import { getWarehouseList } from '@/api/ecw/warehouse'
@@ -536,6 +545,10 @@ export default {
           this.$router.push('/boxSeaAir/shippingSeaAir/' + row.id)
           break
 
+        case "detail":
+        this.$router.push("/boxSeaAir/query/" + row.id);
+          break;
+
         case 'edit':
           this.handleUpdate(row)
           break
@@ -560,6 +573,43 @@ export default {
         case 'error':
           this.$set(this.dialogCfg, 'title', '异常登记')
           break
+        case "downloadPreloadGoodsList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `预装单(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "downloadLoadGoodsList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `已装单(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "downloadReceivableList":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `应收汇总表(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "zipDownload":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `提货单(${row.selfNo}).zip`,
+            "zip"
+          );
+          break;
+        case "downloadAgentListFiles":
+        case "downloadSoncapFiles":
+        case "downloadLadingCopy":
+          downloadFileByUrl(command, { shipmentId: row.id });
+          break;
       }
       if (["editLadingBill", "cost", "error"].includes(command)) {
         this.currRow = row;

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -286,7 +286,7 @@ export default {
         }
       }
       .arrow-area {
-        margin: 0 10px;
+        margin: 0 6px;
       }
     }
   }

src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue

@@ -26,7 +26,7 @@
         </el-card>
 
         <!-- 海运流程图 -->
-        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" width="66px" height="66px" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
+        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" width="50px" height="50px" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
 
         <!-- 海运步骤图 -->
         <seaStepDetail :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />

src/views/ecw/order/singleApply.vue

@@ -24,11 +24,11 @@
             <el-descriptions-item :label="$t('出货渠道')">
                   {{orderData.channelId?getChannelName(orderData.channelId):'/'}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('始发地')" :span="2">
-                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+            <el-descriptions-item :label="$t('始发地')" >
+                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('目的地')">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+            <el-descriptions-item :label="$t('目的地')" :span="2">
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('发货人姓名')">
                 {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}

src/views/ecw/order/splitApply.vue

@@ -27,11 +27,11 @@
           <el-descriptions-item :label="$t('运输方式')">
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('始发地')" :span="2">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+          <el-descriptions-item :label="$t('始发地')" >
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('目的地')">
-             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+          <el-descriptions-item :label="$t('目的地')" :span="2">
+             {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
           </el-descriptions-item>
           <el-descriptions-item :label="$t('发货人姓名')">
               {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
@@ -92,7 +92,7 @@
         <el-table-column :label="$t('入库货物属性')" align="center" width="400">
             <template slot-scope="scope">
               <el-row>
-                <span>{{$t('规格')}}：{{scope.row.boxGauge}}</span>
+                <span>{{$t('规格')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
               </el-row>
               <el-row>
                 <span>{{$t('品牌')}}：
@@ -229,7 +229,7 @@
                     {{shopForm.sum||0}}
                  </el-form-item>
                  <el-form-item :label="$t('放入箱数:')">
-                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum-1"></el-input-number>
+                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
                  </el-form-item>
                  <el-form-item :label="$t('备注信息:')">
                     <el-input v-model="shopForm.remarks"></el-input>
@@ -335,7 +335,6 @@ export default {
             const tds = document.querySelectorAll(
               "#table .el-table__footer-wrapper tr>td"
             );
-            console.log(tds)
             // colSpan合并列
             tds[1].colSpan = 5;
             tds[1].style.textAlign = "left";
@@ -394,7 +393,6 @@ export default {
       this.query.warehouseIds = this.form.destWarehouseId
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      console.log(rowIndex)
       if (rowIndex==this.orderData.orderItemVOList.length) {
         if (columnIndex === 1) {
           return [2, 3];
@@ -424,7 +422,7 @@ export default {
           leviteV += column.warehouseInInfoVO?column.warehouseInInfoVO.volume:0
           leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
       });
-      sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV +' m³ ' + leviteW + ' kg'
+      sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV.toFixed(2) +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV.toFixed(2) +' m³ ' + leviteW + ' kg'
 
       return sums;
     },

src/views/ecw/order/weightDeal.vue

@@ -74,7 +74,7 @@
             </el-table-column>
             <el-table-column :label="$t('入库货物属性')" align="center" >
               <template slot-scope="scope">
-                 <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
+                 <span>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
                  <p>
                   <span>{{$t('品牌')}}：{{getBrand(scope.row.brand)}}&nbsp;&nbsp;</span>
                   <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>

src/views/system/menu/index.vue

@@ -139,6 +139,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.type != '3'" label="重定向" prop="redirect">
+              <el-input v-model="form.redirect" placeholder="请输入重定向地址" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -262,10 +267,11 @@ export default {
         name: undefined,
         enName: undefined,
         icon: undefined,
-        isShowInMenuBar: undefined,
+        isShowInMenuBar: true,
         type: SystemMenuTypeEnum.DIR,
         sort: undefined,
         keepalive: false,
+        redirect: undefined,
         status: CommonStatusEnum.ENABLE
       };
       this.resetForm("form");