货代 2023-12-01

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -23,8 +23,8 @@
                 <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="revokefun">撤销</el-button>
                 <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="wholeRevokefun">全部撤销</el-button>
                 <el-button type="warning" size="small" :disabled="detailData.seeDisabled" @click="cleanCntrNofun">清除箱号</el-button>
-                <el-button type="primary" size="small" :disabled="detailData.seeDisabled"  >批量保存</el-button>
-                <el-button type="success" size="small" :disabled="detailData.seeDisabled"  >导出导入模板</el-button>
+                <el-button type="primary" size="small" :disabled="detailData.seeDisabled" @click="containersSubmitListfun" >批量保存</el-button>
+                <el-button type="success" size="small" :disabled="detailData.seeDisabled" @click="containersExportContainersfun" >导出导入模板</el-button>
                 <el-button type="success" size="small" :disabled="detailData.seeDisabled"  >导入箱号,铅封号</el-button>
 
                 <el-button type="warning" size="small"
@@ -100,12 +100,17 @@ import {
     containersDetail,
     containersSubmit,
     containersRemove,
-    containersCleanBoxNo, containersRevoke, containersEqualDistribution, containersSubmitList
+    containersCleanBoxNo,
+    containersRevoke,
+    containersEqualDistribution,
+    containersSubmitList,
+    containersExportContainers, containersImportBoxNo
 } from "@/api/iosBasicData/containers";
   import {mapGetters} from "vuex";
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
   import bports from "@/views/iosBasicData/bports/index.vue";
   import {bportsList} from "@/api/iosBasicData/bports";
+import {getToken} from "@/util/auth";
 
   export default {
       components: {SearchQuery,bports},
@@ -115,6 +120,7 @@ import {
       },
     data() {
       return {
+          headers: { "Blade-Auth": "Bearer " + getToken() },
           // 是否禁用
           extendedDisabled:false,
           // 装货港数据
@@ -322,12 +328,37 @@ import {
           },
           // 配箱批量保存
           containersSubmitListfun(){
-              containersSubmitList({
-                  containers:[]
-              }).then(res=>{
-                  console.log(res,323)
+              this.$confirm("确定全部保存配箱?", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              }).then(()=>{
+                  containersSubmitList(this.assemblyForm.containersList).then(res=>{
+                      this.$message({
+                          type: "success",
+                          message: "全部撤销成功!"
+                      });
+                      this.$emit('billsDetailfun')
+                  })
               })
           },
+          // 导出导入模板
+          containersExportContainersfun(){
+              this.$confirm('是否导出？', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+              }).then(()=>{
+                  window.open(
+                      `/api/blade-los/containers/exportContainers?${this.website.tokenHeader
+                      }=${getToken()}&pid=${this.assemblyForm.id}`
+                  );
+              })
+          },
+          // 导入箱号,铅封号
+          containersImportBoxNofun(){
+              // containersImportBoxNo
+          },
 
       rowSave(row, done, loading) {
         containersSubmit(row).then(() => {

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1107,12 +1107,14 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
+                    this.pageLoading = true
                     billsCheckBills({
                         id:this.form.id,
                         url: '/iosBasicData/SeafreightExportF/bills/approvalDetails',
                         pageStatus: "this.$store.getters.approvalDetails",
                         pageLabel: "审批详情(F)",
                     }).then(res=>{
+                        this.pageLoading = false
                         this.$message({
                             type: "success",
                             message: "操作成功!"
@@ -1129,9 +1131,11 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(()=>{
+                    this.pageLoading = true
                     billsRevokeCheckBills({
                         id:this.form.id
                     }).then(res=>{
+                        this.pageLoading = false
                         this.$message({
                             type: "success",
                             message: "操作成功!"

src/views/iosBasicData/finstlbills/assembly/costDetails.vue

@@ -1,12 +1,102 @@
 <template>
     <div>
-        测试
+        <el-table
+            ref="tableRef"
+            :cell-style="{padding:'0px',fontSize:'12px'}"
+            :header-cell-style="tableHeaderCellStyle"
+            :data="costDate"
+            border
+            style="width: 100%">
+            <el-table-column
+                prop="corpCnName"
+                label="往来单位">
+            </el-table-column>
+            <el-table-column
+                prop="feeCnName"
+                label="费用简称">
+            </el-table-column>
+            <el-table-column
+                prop="feeCnName"
+                label="预付/到付">
+            </el-table-column>
+            <el-table-column
+                prop="unitNo"
+                label="计量单位">
+            </el-table-column>
+            <el-table-column
+                prop="curCode"
+                label="币种">
+            </el-table-column>
+            <el-table-column
+                prop="taxRate"
+                label="税率">
+            </el-table-column>
+            <el-table-column
+                prop="surchargeRate"
+                label="附件税率">
+            </el-table-column>
+            <el-table-column
+                prop="isTax"
+                label="单价是否含税">
+            </el-table-column>
+            <el-table-column
+                prop="price"
+                label="单价">
+            </el-table-column>
+            <el-table-column
+                prop="quantity"
+                label="数量">
+            </el-table-column>
+            <el-table-column
+                prop="rmbAmountNet"
+                label="CNY(净额)">
+            </el-table-column>
+            <el-table-column
+                prop="usdAmountNet"
+                label="USD(净额)">
+            </el-table-column>
+            <el-table-column
+                prop="rmbAmount"
+                label="CNY(含税)">
+            </el-table-column>
+            <el-table-column
+                prop="usdAmount"
+                label="USD(含税)">
+            </el-table-column>
+            <el-table-column
+                prop="exrate"
+                label="对CNY汇率">
+            </el-table-column>
+            <el-table-column
+                prop="payplace"
+                label="预付地址">
+            </el-table-column>
+            <el-table-column
+                prop="remarks"
+                label="备注">
+            </el-table-column>
+        </el-table>
     </div>
 </template>
 
 <script>
     export default {
+        data(){
+            return {}
 
+        },
+        props:{
+            costDate:{
+                type:Array,
+                default:[]
+            }
+        },
+        methods:{
+            // 表头样式
+            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
+                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
+            },
+        }
     }
 </script>
 

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -26,7 +26,9 @@
                 <!--</template>-->
             </el-table-column>
             <el-table-column type="expand">
-                <costDetails></costDetails>
+                <template slot-scope="{row}">
+                        <costDetails :costDate="row.costDate || []"></costDetails>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="lineNo"
@@ -329,6 +331,10 @@
             handleSelectionData:{
                 type:Array,
                 default:[],
+            },
+            form:{
+                type:Object,
+                default:{},
             }
         },
         data(){
@@ -360,10 +366,28 @@
             },
             // 展开行或者关闭
             expandChange(row,expandedRows){
-                feecenterSelectByAccNoList({accBillId:row.id}).then(res=>{
-                    console.log(res,364)
+                let accBillId = ''
+                if (this.form.id) {
+                    accBillId = row.accBillId
+                }else {
+                    accBillId = row.id
+                }
+                feecenterSelectByAccNoList({accBillId}).then(res=>{
+                    row.costDate = res.data.data.map(item=>{
+                        if (item.curCode == 'CNY') {
+                            this.$set(item,'rmbAmount',item.amount)
+                            this.$set(item,'usdAmount','')
+                            this.$set(item,'rmbAmountNet',item.amountNet)
+                            this.$set(item,'usdAmountNet','')
+                        }else {
+                            this.$set(item,'usdAmount',item.amount)
+                            this.$set(item,'rmbAmount','')
+                            this.$set(item,'usdAmountNet',item.amountNet)
+                            this.$set(item,'rmbAmountNet','')
+                        }
+                        return item
+                    })
                 })
-                console.log(row,expandedRows,361)
             },
             // 接口请求
             // 是否接口

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -527,6 +527,7 @@
                 </div>
 
                 <finstlbillsitems :tableData="tableData"
+                                  :form="form"
                                   :handleSelectionData="handleSelectionData"
                                   @handleSelectionChange="handleSelectionChange">
                 </finstlbillsitems>
@@ -816,6 +817,7 @@
                             this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
                             this.$set(item,'currentStlAmountUSD',item.currentStlAmount)
                         }
+                        this.$set(item,'costDate',[])
                         return item
                     })
                     this.form.isSignfor = this.form.isSignfor + ''