吉永集装箱8.25 bug修改

src/components/upload/index.vue

@@ -573,16 +573,7 @@ export default {
     },
     //修改触发
     rowCell(row, index) {
-        let i = 0
-        for(let item of this.data) {
-            if(item.version === '0') {
-                if (i == 1) {
-                    console.log('提示')
-                    return
-                }
-                i++
-            }
-        }
+
       if (row.$cellEdit == true) {
         this.$set(row, "$cellEdit", false);
       } else {

src/views/EquipmentArchives/index.vue

@@ -62,6 +62,8 @@ export default {
   name: "index",
   data() {
     return {
+        orderItemsList:[],
+
       src: '',
       show: true,
       loading: false,
@@ -100,16 +102,18 @@ export default {
   },
   methods: {
       // 表格的下拉
-      expandChange(row, expendList){
+      async expandChange(row, expendList){
           row.loading = true
-          corpequipmentarchivesitemList({
+          // this.dataList[row.$index].loading = true
+          console.log(row,107)
+          const {data} = await corpequipmentarchivesitemList({
               current: 1,
               size: 20,
               pid:row.id
-          }).then(res=>{
-              row.orderItemsList = res.data.data.records
-              row.loading = false
           })
+          row.orderItemsList = data.data.records
+          row.loading = false
+
       },
       // 导出设备
       openExport() {

src/views/SpecialTrade/dispatchingCars/detailPage.vue

@@ -1012,8 +1012,8 @@ export default {
                     },
                       change: (data) => {
                         // if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 119111) {
-                        console.log("a")
                           fleetListS(data.row.fleetId).then(res => {
+                              console.log(res,1017)
                             this.driverIddata = res.data.data
                           })
                         // } else {
@@ -1037,8 +1037,7 @@ export default {
                         label: "plateNo",
                         value: "plateNo"
                     },
-                    change: (data) => {
-                    }
+
                 }, {
                     label: '司机',
                     width: 115,
@@ -1761,7 +1760,7 @@ export default {
 
         this.KeyBoxTwo++
         this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
-        this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
+        this.findObject(this.paymentOption.column, "plateNo").dicUrl = "/api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
         this.findObject(this.paymentOption.column, "plateNo").dicFormatter = (data) => {
             let list = []
             data.data.forEach(ele => {
@@ -1845,6 +1844,7 @@ export default {
             })
         }
         this.KeyBoxTwo++
+
         this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
             fleetList({fleetId: data.row.fleetId}).then(res => {
                 for (let item in res.data.data) {
@@ -1874,7 +1874,7 @@ export default {
         //   });
         //   this.key++
         // }
-        this.$refs.other.show = false
+        // this.$refs.other.show = false
         // 非租户模式默认加载管理组数据
         if (!website.tenantMode) {
             this.initData(website.tenantId);
@@ -2225,9 +2225,8 @@ export default {
                     this.$message.success("保存成功");
                 })
             }
-          console.log(row.plateNo)
+          console.log(row,2229)
           if (row.fleetId != null) {
-            console.log(1)
             fleetListS(row.fleetId).then(res => {
               this.driverIddata = res.data.data
             })
@@ -2243,11 +2242,8 @@ export default {
               item.cell = true
             }
           })
-
+            // row.$cellEdit = !row.$cellEdit
             this.$refs.crudBoxTwo.rowCell(row, index)
-
-          console.log("row.plateNo")
-          console.log(row.plateNo)
         },
         //调度并且派车
         rowSaveThree(row, index, done, loading) {
@@ -2386,6 +2382,7 @@ export default {
         rowCell(row, index) {
             if (row.$cellEdit) {
                 // if (row.plateNo) {
+                console.log(row)
                     if (row.feeId) {
                         incidentalSubmit(row).then(res => {
                             this.$refs.collection.rowCell(row, index)

src/views/basicData/container/archives.vue

@@ -104,6 +104,9 @@
             @resetColumn="resetColumnTwo('crudTrack','optionTrack','optionTrackBack',234.1)"
             @saveColumn="saveColumnTwo('crudTrack','optionTrack','optionTrackBack',234.1)"
             v-model="formTrack">
+            <template slot-scope="{type,size,row,index,disabled}" slot="contractNo">
+                <span class="el-button--text" style="cursor: pointer" @click="contractNoJump(row)">{{row.contractNo}}</span>
+            </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
             <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
                        @click="$refs.crudTrack.rowEdit(row,index)">编辑
@@ -123,6 +126,7 @@ import {addUpdate, boxRemove, getList, remove} from "@/api/box/archives";
 import {getToken} from "@/util/auth";
 import {getAllBoxs} from "@/api/basicData/portinformation";
 import {archivestrajectory, update} from "@/api/boxManagement/exportShipment";
+import fa from "element-ui/src/locale/lang/fa";
 export default {
   name: "archives",
   data() {
@@ -152,6 +156,10 @@ export default {
         dialogTop: 25,
         dialogWidth: "80%",
         column: [{
+            label: '合同号',
+            prop: 'contractNo',
+            overHidden: true
+        },{
           label: '箱号',
           prop: 'code',
           overHidden: true,
@@ -516,6 +524,36 @@ export default {
     }
   },
   methods: {
+      // 箱轨迹里合同号跳转
+      contractNoJump(row) {
+          this.boxTrack = false
+          if (row.status == '买箱') {
+              this.$router.push({
+                  path: '/boxManagement/buyContainer/index?srcId=' + row.srcId
+              });
+          }else if (row.status == '卖箱') {
+              this.$router.push({
+                  path: '/boxManagement/sellingContainers/index?srcId=' + row.srcId
+              });
+          }else if (row.status == '出口装运') {
+              this.$router.push({
+                  path: '/boxManagement/exportShipment/index?srcId=' + row.srcId
+              });
+          }else if (row.status == '进口返程') {
+              this.$router.push({
+                  path: '/boxManagement/importReturnTrip/index?srcId=' + row.srcId
+              });
+          }else if (row.status == '租入') {
+              this.$router.push({
+                  path: '/boxManagement/leaseIn/index?srcId=' + row.srcId
+              });
+          }else if (row.status == '租出') {
+              this.$router.push({
+                  path: '/boxManagement/leaseOut/index?srcId=' + row.srcId
+              });
+          }else {}
+
+      },
     track(row) {
       // this.dataTrackList = row
       this.formSearch = row

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -59,7 +59,7 @@
           @saveColumn="saveColumnTwo('crud','option','optionBack',235.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -206,12 +206,14 @@ export default {
   components: {checkSchedule, reportDialog, check},
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         page: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
         search:{},
       disabledVisible: false,
@@ -1110,9 +1112,49 @@ export default {
           amount: form.amount,
         })
       })
-
+        // 箱信息的保存
         this.tradingBoxItemSubmitfun(form)
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1601094502922174465',
+            itemName: "买箱费",
+            // 客户id
+            corpId:this.form.purchaseCompanyId,
+            corpName: this.form.purchaseCompanyName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 2,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_two.push(obj)
+        this.$refs.boxCost.tradingBoxFeesSubmitfun(obj)
     },
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+        // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
+
       // 箱信息的编辑
     rowUpdate(form, index, done, loading) {
       form.boxType = form.$boxTypeId
@@ -1142,8 +1184,47 @@ export default {
           }
         }
       })
-
         this.tradingBoxItemSubmitfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_two) {
+            if (this.ZCcode == this.$refs.boxCost.data_two[index].code){
+                this.$refs.boxCost.data_two[index] = {
+                    id:this.$refs.boxCost.data_two[index].id,
+                    // 费用名称id
+                    itemId:'1601094502922174465',
+                    itemName: "买箱费",
+                    // 客户id
+                    corpId:this.form.purchaseCompanyId,
+                    corpName: this.form.purchaseCompanyName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 2,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.tradingBoxFeesSubmitfun(this.$refs.boxCost.data_two[index])
+                break;
+            }
+        }
+
     },
       // 箱信息的添加和编辑接口
       tradingBoxItemSubmitfun(form){

src/views/boxManagement/buyContainer/index.vue

@@ -33,7 +33,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+          <el-button class="el-icon-download" type="warning" size="small"
+                     @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxOut')">
+              导出
+          </el-button>
+          <el-button class="el-icon-download" type="warning" size="small"
+                     @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxItemOut')">
+              导出明细
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -157,6 +164,11 @@ export default {
           prop: 'totalAmount',
           width: 100,
           overHidden: true
+        },{
+            label: '订单金额(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
         }, {
           label: '状态',
           prop: 'status',
@@ -248,6 +260,12 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+    // 箱档案跳转过来的
+    if (this.$route.query.srcId) {
+        this.form.id = this.$route.query.srcId
+        this.detailsOpen = true
+    }
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(235), this.optionList);
@@ -315,7 +333,8 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+      // 导出公用方法 传请求地址
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -332,7 +351,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/tradingBox/exportTradingBoxOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           ...config.params,    //括号内是要传递给新窗口的参数
           type:"BUY"

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -75,7 +75,7 @@
                      @click="track(row)">箱轨迹
           </el-button>
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -294,12 +294,14 @@ export default {
   components: {checkSchedule,reportDialog,check},
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         xiangpage: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
         xiangsearch:{},
       checkData: {},
@@ -1455,6 +1457,8 @@ export default {
       rowaddfun(){
           this.$refs["form"].validate((valid,done) => {
               if (valid) {
+                  // 把目的港赋值地点
+                  this.formTwo.addressId = this.form.objectiveHarborId
                   const idp = this.form.id?this.form.id:this.onLoad.id
                   if (!idp) {
                       return this.$message.warning('请先填写保存数据');
@@ -1466,6 +1470,12 @@ export default {
               }
           })
       },
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+          // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
       // 箱信息的添加
     rowSave(form, done, loading) {
       let result = this.dataList.some((item) => {
@@ -1499,8 +1509,41 @@ export default {
           amount: form.amount,
         })
       })
-
         this.transportItemSubmitfunfun(form)
+
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1636526426121347073',
+            itemName: "租金",
+            // 客户id
+            corpId: this.form.corpId,
+            corpName: this.form.corpName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 1,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_one.push(obj)
+        this.$refs.boxCost.transportItemFeesSubmitdatafun(obj)
     },
       // 箱轨迹的编辑
     rowUpdateTrack(form, index, done, loading) {
@@ -1521,6 +1564,7 @@ export default {
               this.xiangpagefun(this.page)
           })
       },
+
       // 箱信息的编辑
     rowUpdate(form, index, done, loading) {
       if (!Number(form.price) || Number(form.price) < 0) {
@@ -1557,6 +1601,46 @@ export default {
       })
 
         this.transportItemSubmitfunfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_one) {
+            if (this.ZCcode == this.$refs.boxCost.data_one[index].code){
+                this.$refs.boxCost.data_one[index] = {
+                    id:this.$refs.boxCost.data_one[index].id,
+                    // 费用名称id
+                    itemId:'1636526426121347073',
+                    itemName: "租金",
+                    // 客户id
+                    corpId: this.form.corpId,
+                    corpName: this.form.corpName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 1,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.transportItemFeesSubmitdatafun(this.$refs.boxCost.data_one[index])
+                break;
+            }
+        }
+
     },
     getGSData(row, type) {
       this[type[0]][type[1]] = row.cname

src/views/boxManagement/exportShipment/index.vue

@@ -45,7 +45,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/transport/exportTransportOut')">
+                导出
+            </el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/transport/exportTransportItemOut')">
+                导出明细
+            </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -244,11 +251,21 @@ export default {
           width: 100,
           overHidden: true
         }, {
+            label: '租金合计(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
+        }, {
           label: '超期箱使合计',
           prop: 'overdueAmount',
           width: 100,
           overHidden: true
         }, {
+            label: '超期箱使合计(外币)',
+            prop: 'overdueAmountU',
+            width: 140,
+            overHidden: true
+        }, {
           label: '备注',
           prop: 'remarks',
           width: 100,
@@ -340,6 +357,12 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+      // 箱档案跳转过来的
+      if (this.$route.query.srcId) {
+          this.form.id = this.$route.query.srcId
+          this.detailsOpen = true
+      }
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(237), this.optionList);
@@ -407,7 +430,7 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -424,7 +447,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/transport/exportTransportOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           billType: "CKZY",
           ...config.params    //括号内是要传递给新窗口的参数

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -74,7 +74,7 @@
                      @click="track(row)">箱轨迹
           </el-button>
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -298,12 +298,14 @@ export default {
   components: {checkSchedule,reportDialog,check},
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         xiangpage: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
         xiangsearch:{},
       checkData: {},
@@ -1465,6 +1467,8 @@ export default {
       rowaddfun(){
           this.$refs["form"].validate((valid,done) => {
               if (valid) {
+                  // 把目的港赋值地点
+                  this.formTwo.addressId = this.form.objectiveHarborId
                   const idp = this.form.id?this.form.id:this.onLoad.id
                   if (!idp) {
                       return this.$message.warning('请先填写保存数据');
@@ -1476,6 +1480,14 @@ export default {
               }
           })
       },
+
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+          // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
+
       // 箱信息数据
     rowSave(form, done, loading) {
       let result = this.dataList.some((item) => {
@@ -1509,8 +1521,42 @@ export default {
           amount: form.amount,
         })
       })
-
         this.transportItemSubmitfunfun(form)
+
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1636526426121347073',
+            itemName: "租金",
+            // 客户id
+            corpId: this.form.corpId,
+            corpName: this.form.corpName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 1,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_one.push(obj)
+        this.$refs.boxCost.transportItemFeesSubmitdatafun(obj)
+
     },
     rowUpdateTrack(form, index, done, loading) {
       update(form).then(res => {
@@ -1553,8 +1599,47 @@ export default {
           }
         }
       })
-
         this.transportItemSubmitfunfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_one) {
+            if (this.ZCcode == this.$refs.boxCost.data_one[index].code){
+                this.$refs.boxCost.data_one[index] = {
+                    id:this.$refs.boxCost.data_one[index].id,
+                    // 费用名称id
+                    itemId:'1636526426121347073',
+                    itemName: "租金",
+                    // 客户id
+                    corpId: this.form.corpId,
+                    corpName: this.form.corpName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 1,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.transportItemFeesSubmitdatafun(this.$refs.boxCost.data_one[index])
+                break;
+            }
+        }
+
     },
 
       // 出口 进口箱信息的添加和编辑接口

src/views/boxManagement/importReturnTrip/index.vue

@@ -45,7 +45,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/transport/exportTransportOut')">
+                导出
+            </el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/transport/exportTransportItemOut')">
+                导出明细
+            </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -244,11 +251,21 @@ export default {
           width: 100,
           overHidden: true
         }, {
+            label: '租金合计(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
+        }, {
           label: '超期箱使合计',
           prop: 'overdueAmount',
           width: 100,
           overHidden: true
         }, {
+            label: '超期箱使合计(外币)',
+            prop: 'overdueAmountU',
+            width: 140,
+            overHidden: true
+        }, {
           label: '备注',
           prop: 'remarks',
           width: 100,
@@ -340,6 +357,13 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+      // 箱档案跳转过来的
+      if (this.$route.query.srcId) {
+          this.form.id = this.$route.query.srcId
+          this.detailsOpen = true
+      }
+
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(237.9), this.optionList);
@@ -407,7 +431,7 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -424,7 +448,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/transport/exportTransportOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           billType: "JKFC",
           ...config.params    //括号内是要传递给新窗口的参数

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -61,7 +61,7 @@
           @saveColumn="saveColumnTwo('crud','option','optionBack',245.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled || row.count > 0" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -240,12 +240,14 @@ export default {
   },
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         page: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
       checkData: {},
       checkDialog: false,
@@ -1453,12 +1455,94 @@ export default {
       }
       form.boxType = form.$boxTypeId
         this.tradingBoxItemSubmitRentfun(form)
+
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1636526426121347073',
+            itemName: "租金",
+            // 客户id
+            corpId:this.form.purchaseCompanyId,
+            corpName: this.form.purchaseCompanyName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 2,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_two.push(obj)
+        this.$refs.boxCost.tradingBoxFeesSubmitfun(obj)
       done(form)
+
     },
+
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+          // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
+
       // 箱信息的编辑
     rowUpdate(form, index, done, loading) {
       form.boxType = form.$boxTypeId
         this.tradingBoxItemSubmitRentfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_two) {
+            if (this.ZCcode == this.$refs.boxCost.data_two[index].code){
+                this.$refs.boxCost.data_two[index] = {
+                    id:this.$refs.boxCost.data_two[index].id,
+                    // 费用名称id
+                    itemId:'1636526426121347073',
+                    itemName: "租金",
+                    // 客户id
+                    corpId:this.form.purchaseCompanyId,
+                    corpName: this.form.purchaseCompanyName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 2,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.tradingBoxFeesSubmitfun(this.$refs.boxCost.data_two[index])
+                break;
+            }
+        }
       done(form)
     },
       // 箱信息的添加和保存

src/views/boxManagement/leaseIn/index.vue

@@ -33,7 +33,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxOut')">
+                导出
+            </el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxItemOut')">
+                导出明细
+            </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -163,6 +170,11 @@ export default {
           prop: 'totalAmount',
           width: 100,
           overHidden: true
+        },{
+            label: '订单金额(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
         }, {
           label: '状态',
           prop: 'status',
@@ -267,6 +279,13 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+      // 箱档案跳转过来的
+      if (this.$route.query.srcId) {
+          this.form.id = this.$route.query.srcId
+          this.detailsOpen = true
+      }
+
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(245), this.optionList);
@@ -334,7 +353,7 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -351,7 +370,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/tradingBox/exportTradingBoxOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           ...config.params,    //括号内是要传递给新窗口的参数
           type:"ZR"

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -61,7 +61,7 @@
           @saveColumn="saveColumnTwo('crud','option','optionBack',248.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled || row.count > 0" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -234,12 +234,14 @@ export default {
   components:{checkSchedule,reportDialog,check},
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         page: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
       checkData: {},
       checkDialog: false,
@@ -1415,7 +1417,7 @@ export default {
               }
           })
       },
-      // 箱信息添加
+      // 箱信息添加确认
     rowSave(form,done,loading) {
       let result = this.dataList.some((item) => {
         if (item.code == form.code) {
@@ -1428,12 +1430,94 @@ export default {
       }
       form.boxType = form.$boxTypeId
         this.tradingBoxItemSubmitRentfun(form)
+
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1636526426121347073',
+            itemName: "租金",
+            // 客户id
+            corpId:this.form.purchaseCompanyId,
+            corpName: this.form.purchaseCompanyName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 1,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_one.push(obj)
+        this.$refs.boxCost.tradingBoxFeesSubmitfun(obj)
       done(form)
     },
+
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+          // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
+
       // 箱信息编辑弹窗确认按钮
     rowUpdate(form, index, done, loading) {
       form.boxType = form.$boxTypeId
         this.tradingBoxItemSubmitRentfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_one) {
+            if (this.ZCcode == this.$refs.boxCost.data_one[index].code){
+                this.$refs.boxCost.data_one[index] = {
+                    id:this.$refs.boxCost.data_one[index].id,
+                    // 费用名称id
+                    itemId:'1636526426121347073',
+                    itemName: "租金",
+                    // 客户id
+                    corpId:this.form.purchaseCompanyId,
+                    corpName: this.form.purchaseCompanyName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 1,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.tradingBoxFeesSubmitfun(this.$refs.boxCost.data_one[index])
+                break;
+            }
+        }
+
       done(form)
     },
       // 箱信息的保存和添加

src/views/boxManagement/leaseOut/index.vue

@@ -33,7 +33,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxOut')">
+                导出
+            </el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxItemOut')">
+                导出明细
+            </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -163,6 +170,11 @@ export default {
           prop: 'totalAmount',
           width: 100,
           overHidden: true
+        },{
+            label: '订单金额(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
         }, {
           label: '状态',
           prop: 'status',
@@ -267,6 +279,13 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+      // 箱档案跳转过来的
+      if (this.$route.query.srcId) {
+          this.form.id = this.$route.query.srcId
+          this.detailsOpen = true
+      }
+
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(247), this.optionList);
@@ -334,7 +353,7 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -351,7 +370,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/tradingBox/exportTradingBoxOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           ...config.params,    //括号内是要传递给新窗口的参数
           type:"ZC"

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -61,7 +61,7 @@
           @saveColumn="saveColumnTwo('crud','option','optionBack',236.1)">
         <template slot-scope="{type,size,row,index,disabled}" slot="menu">
           <el-button icon="el-icon-edit" :size="size" :disabled="disabled" :type="type"
-                     @click="$refs.crud.rowEdit(row,index)">编辑
+                     @click="xiangbianji(row,index)">编辑
           </el-button>
           <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
                      @click="rowDel(row,index,'MX')">删除
@@ -205,12 +205,14 @@ export default {
   components:{checkSchedule,reportDialog,check},
   data() {
     return {
+        // 箱管理编辑暂存的箱号
+        ZCcode:null,
         // 分页
         page: {
             pageSize: 20,
             currentPage: 1,
             total: 0,
-            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 2000]
         },
         search:{},
       title: '',
@@ -1124,10 +1126,50 @@ export default {
           amount: form.amount,
         })
       })
-
+        // 箱信息的保存
         this.tradingBoxItemSubmitfun(form)
+        // 费用的保存
+        const obj = {
+            // 费用名称id
+            itemId:'1601094557834002434',
+            itemName: "卖箱费",
+            // 客户id
+            corpId:this.form.purchaseCompanyId,
+            corpName: this.form.purchaseCompanyName,
+            // 排序
+            sort:1,
+            // 数量
+            quantity:1,
+            // 单价
+            price:form.amount,
+            // 金额
+            amount: form.amount,
+            // 币别
+            currency:form.currency,
+            // 1.应收 2.应付
+            feesType: 1,
+            // 箱号
+            code: form.code,
+            // 业务类型
+            billType: "",
+            // 是否自动生成（0否1是）
+            autoGenerate:1,
+            // 是否手动录入
+            identifier:0,
+            pid: form.pid,
+            remarks:form.remarks,
+        }
+        this.$refs.boxCost.data_one.push(obj)
+        this.$refs.boxCost.tradingBoxFeesSubmitfun(obj)
 
     },
+      // 箱编辑弹窗接口
+      xiangbianji(row,index){
+          // 暂存箱号
+          this.ZCcode = row.code
+          this.$refs.crud.rowEdit(row,index)
+      },
+
       // 箱信息的编辑
     rowUpdate(form, index, done, loading) {
       form.boxType = form.$boxTypeId
@@ -1157,8 +1199,46 @@ export default {
           }
         }
       })
-
         this.tradingBoxItemSubmitfun(form)
+
+        // 费用的更改
+        for(let index in this.$refs.boxCost.data_one) {
+            if (this.ZCcode == this.$refs.boxCost.data_one[index].code){
+                this.$refs.boxCost.data_one[index] = {
+                    id:this.$refs.boxCost.data_one[index].id,
+                    // 费用名称id
+                    itemId:'1601094502922174465',
+                    itemName: "买箱费",
+                    // 客户id
+                    corpId:this.form.purchaseCompanyId,
+                    corpName: this.form.purchaseCompanyName,
+                    // 排序
+                    sort:1,
+                    // 数量
+                    quantity:1,
+                    // 单价
+                    price:form.amount,
+                    // 金额
+                    amount: form.amount,
+                    // 币别
+                    currency:form.currency,
+                    // 1.应收 2.应付
+                    feesType: 1,
+                    // 箱号
+                    code: form.code,
+                    // 业务类型
+                    billType: "",
+                    // 是否自动生成（0否1是）
+                    autoGenerate:1,
+                    // 是否手动录入
+                    identifier:0,
+                    pid: form.pid,
+                    remarks:form.remarks,
+                }
+                this.$refs.boxCost.tradingBoxFeesSubmitfun(this.$refs.boxCost.data_one[index])
+                break;
+            }
+        }
     },
       // 箱信息的保存和添加
       tradingBoxItemSubmitfun(form){

src/views/boxManagement/sellingContainers/index.vue

@@ -33,7 +33,14 @@
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">创建单据</el-button>
           <el-button class="el-icon-document-copy" type="success" size="small">复制单据</el-button>
-          <el-button class="el-icon-download" type="warning" size="small" @click="outExport">导出</el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxOut')">
+                导出
+            </el-button>
+            <el-button class="el-icon-download" type="warning" size="small"
+                       @click="outExport('/api/blade-box-tube/tradingBox/exportTradingBoxItemOut')">
+                导出明细
+            </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -156,6 +163,11 @@ export default {
           prop: 'totalAmount',
           width: 100,
           overHidden: true
+        },{
+            label: '订单金额(外币)',
+            prop: 'totalAmountU',
+            width: 140,
+            overHidden: true
         }, {
           label: '状态',
           prop: 'status',
@@ -248,6 +260,13 @@ export default {
       this.detailsOpen = true
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
+
+      // 箱档案跳转过来的
+      if (this.$route.query.srcId) {
+          this.form.id = this.$route.query.srcId
+          this.detailsOpen = true
+      }
+
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(236), this.optionList);
@@ -315,7 +334,7 @@ export default {
         this.loading = false
       })
     },
-    outExport() {
+    outExport(path) {
       let config = {params: {...this.search}}
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
@@ -332,7 +351,7 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-box-tube/tradingBox/exportTradingBoxOut',      //跳转目标窗口的地址
+        path: path,      //跳转目标窗口的地址
         query: {
           ...config.params,    //括号内是要传递给新窗口的参数
           type:"SELL"

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -97,6 +97,18 @@
       "width": 120
     },
     {
+      "label": "日期起",
+      "prop": "rentStartDate",
+      "index": 8,
+      "width": 180
+    },
+    {
+      "label": "日期止",
+      "prop": "rentEndDate",
+      "index": 9,
+      "width": 180
+    },
+    {
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -48,6 +48,14 @@
       "index": 3
     },
     {
+      "label": "箱号",
+      "prop": "code",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 3
+    },
+    {
       "label": "往来单位",
       "prop": "corpId",
       "search": true,

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -97,6 +97,18 @@
       "width": 120
     },
     {
+      "label": "日期起",
+      "prop": "rentStartDate",
+      "index": 8,
+      "width": 180
+    },
+    {
+      "label": "日期止",
+      "prop": "rentEndDate",
+      "index": 9,
+      "width": 180
+    },
+    {
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -48,6 +48,14 @@
       "index": 3
     },
     {
+      "label": "箱号",
+      "prop": "code",
+      "search": true,
+      "overHidden": true,
+      "width": 150,
+      "index": 3
+    },
+    {
       "label": "往来单位",
       "prop": "corpId",
       "search": true,

src/views/product/detailsPage.vue

@@ -717,6 +717,20 @@ export default {
         done();
         if (valid) {
           this.loadingBtn = true;
+
+            let i = 0
+            for(let item of this.filesList) {
+                console.log(i,item)
+                if(item.version == 0) {
+                    if (i == 1) {
+                        this.$message.warning("附件主图不能重复选择")
+                        this.loadingBtn = false;
+                        return
+                    }
+                    i++
+                }
+            }
+
           var categoryitemId = '';
           var categoryitem = '';
           var categoryitemList = this.form.categoryitemList