Browse Source

货代海运出口配箱10.25

caojunjie 2 years ago
parent
commit
04c0adab7e

+ 10 - 0
src/api/iosBasicData/containers.js

@@ -61,3 +61,13 @@ export const containersRevoke = (ids) => {
     }
   })
 }
+// 平均分配
+export const containersEqualDistribution = (row) => {
+  return request({
+    url: '/api/blade-los/containers/equalDistribution',
+    method: 'post',
+    data: row
+  })
+}
+
+

+ 0 - 1
src/api/iosBasicData/feecenter.js

@@ -21,7 +21,6 @@ export const feecenterDetail = (id) => {
     }
   })
 }
-// 详情
 export const feecenterRemove = (ids) => {
   return request({
     url: '/api/blade-los/feecenter/remove',

+ 19 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox.vue

@@ -3,7 +3,9 @@
         <div>
             <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id"
                         @selectionChange="selectionChange"
-                        @rowSavefun="containersSubmitfun" @billsDetailfun="billsDetailfun"></containers>
+                        @rowSavefun="containersSubmitfun"
+                        @billsDetailfun="billsDetailfun"
+                        @equalDistribution="containersEqualDistributionfun"></containers>
         </div>
 
         <div>
@@ -19,7 +21,9 @@
 import containers from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue";
 import PackingBusiness from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue";
 import {containersSubmit} from "@/api/iosBasicData/containers";
-    export default {
+import {containersEqualDistribution} from "@/api/iosBasicData/containers";
+
+export default {
         components:{
             containers,
             PackingBusiness
@@ -35,6 +39,19 @@ import {containersSubmit} from "@/api/iosBasicData/containers";
             }
         },
         methods:{
+            // 平均分配接口
+            containersEqualDistributionfun(){
+                containersEqualDistribution({
+                    pid:this.assemblyForm.id,
+                    waitingBox:this.assemblyForm.waitingBoxList[0]
+                }).then(res=>{
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    })
+                    this.billsDetailfun()
+                })
+            },
             // 详情接口
             billsDetailfun(){
                 this.$emit('billsDetailfun')

+ 55 - 50
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -2,55 +2,8 @@
     <div>
         <div class="tbasTop">
             <el-table
-                :data="containersBillsList"
-                border
-                height="300px"
-                style="width: 100%">
-                <el-table-column
-                    prop="code"
-                    label="业务编号">
-                </el-table-column>
-                <el-table-column
-                    prop="hblno"
-                    label="HBLNO">
-                </el-table-column>
-                <el-table-column
-                    prop="mblno"
-                    label="MBLNO">
-                </el-table-column>
-                <el-table-column
-                    prop="polCnName"
-                    label="目的港">
-                </el-table-column>
-                <el-table-column
-                    prop="quantity"
-                    label="件数">
-                </el-table-column>
-                <el-table-column
-                    prop="grossWeight"
-                    label="毛重">
-                </el-table-column>
-                <el-table-column
-                    prop="measurement"
-                    label="尺码">
-                </el-table-column>
-                <el-table-column
-                    prop="remarks"
-                    label="备注">
-                </el-table-column>
-                <el-table-column
-                    fixed="right"
-                    label="操作"
-                    width="100">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-
-        <div class="tbasTop">
-            <el-table
+                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px'}"
                 :data="assemblyForm.waitingBoxList"
                 border
                 height="300px"
@@ -131,6 +84,57 @@
                 </el-table-column>
             </el-table>
         </div>
+
+        <div class="tbasTop">
+            <el-table
+                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px'}"
+                :data="containersBillsList"
+                border
+                height="300px"
+                style="width: 100%">
+                <el-table-column
+                    prop="code"
+                    label="业务编号">
+                </el-table-column>
+                <el-table-column
+                    prop="hblno"
+                    label="HBLNO">
+                </el-table-column>
+                <el-table-column
+                    prop="mblno"
+                    label="MBLNO">
+                </el-table-column>
+                <el-table-column
+                    prop="polCnName"
+                    label="目的港">
+                </el-table-column>
+                <el-table-column
+                    prop="quantity"
+                    label="件数">
+                </el-table-column>
+                <el-table-column
+                    prop="grossWeight"
+                    label="毛重">
+                </el-table-column>
+                <el-table-column
+                    prop="measurement"
+                    label="尺码">
+                </el-table-column>
+                <el-table-column
+                    prop="remarks"
+                    label="备注">
+                </el-table-column>
+                <el-table-column
+                    fixed="right"
+                    label="操作"
+                    width="100">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
     </div>
 </template>
 
@@ -176,11 +180,12 @@
 
 </script>
 
-<style scoped>
+<style scoped lang="scss">
     .tbasTop {
         margin: 10px 0;
     }
     ::v-deep.el-table td, .el-table th {
         padding: 5px 0;
     }
+
 </style>

+ 60 - 338
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -7,6 +7,8 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :row-style="{height:'20px'}"
+               :cell-style="{padding:'0px'}"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -23,12 +25,15 @@
                 <el-button type="danger" size="small" @click="revokefun">撤销</el-button>
                 <el-button type="danger" size="small" @click="wholeRevokefun">全部撤销</el-button>
                 <el-button type="warning" size="small" @click="cleanCntrNofun">清除箱号</el-button>
+                <el-button type="warning" size="small"
+                           :disabled="assemblyForm.billType != 'DD' && numberfalsefun()"
+                           @click="equalDistribution">平均分配</el-button>
             </div>
-            <div>
-                <el-button size="small">Copy</el-button>
-                <el-button size="small">查看箱信息</el-button>
-                <el-button size="small">校验箱信息</el-button>
-            </div>
+            <!--<div>-->
+            <!--    <el-button size="small">Copy</el-button>-->
+            <!--    <el-button size="small">查看箱信息</el-button>-->
+            <!--    <el-button size="small">校验箱信息</el-button>-->
+            <!--</div>-->
         </div>
       </template>
         <template slot-scope="scope" slot="menu">
@@ -52,6 +57,26 @@
                       size="small" clearable placeholder="请输入封号"></el-input>
             <span v-else>{{scope.row.sealNo}}</span>
         </template>
+        <template slot-scope="scope" slot="quantity">
+            <el-input v-if="scope.row.edit" v-model="scope.row.quantity"
+                      size="small" clearable placeholder="请输入件数"></el-input>
+            <span v-else>{{Number(scope.row.quantity).toFixed(2)}}</span>
+        </template>
+        <template slot-scope="scope" slot="grossWeight">
+            <el-input v-if="scope.row.edit" v-model="scope.row.grossWeight"
+                      size="small" clearable placeholder="请输入毛重"></el-input>
+            <span v-else>{{scope.row.grossWeight}}</span>
+        </template>
+        <template slot-scope="scope" slot="netWeight">
+            <el-input v-if="scope.row.edit" v-model="scope.row.netWeight"
+                      size="small" clearable placeholder="请输入净重"></el-input>
+            <span v-else>{{scope.row.netWeight}}</span>
+        </template>
+        <template slot-scope="scope" slot="measurement">
+            <el-input v-if="scope.row.edit" v-model="scope.row.measurement"
+                      size="small" clearable placeholder="请输入尺码"></el-input>
+            <span v-else>{{scope.row.measurement}}</span>
+        </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -62,12 +87,13 @@ import {
     containersDetail,
     containersSubmit,
     containersRemove,
-    containersCleanBoxNo, containersRevoke
+    containersCleanBoxNo, containersRevoke, containersEqualDistribution
 } 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 fa from "element-ui/src/locale/lang/fa";
 
   export default {
       components: {SearchQuery,bports},
@@ -102,92 +128,6 @@ import {
           selection: true,
           dialogClickModal: false,
           column: [
-            // {
-            //   label: "主表id",
-            //   prop: "pid",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入主表id",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "行号",
-            //   prop: "lineNo",
-            //     width: "160",
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入行号",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "单据编号",
-            //   prop: "billNo",
-            // },
-            // // {
-            // //   label: "装货港 id",
-            // //   prop: "polId",
-            // //   rules: [{
-            // //     required: true,
-            // //     message: "请输入装货港 id",
-            // //     trigger: "blur"
-            // //   }]
-            // // },
-            // {
-            //   label: "装货港中文名称",
-            //   prop: "polCnName",
-            //   width: "140",
-            //   formslot:true,
-            // },
-            // {
-            //    label: "装货港代码",
-            //    prop: "polCode",
-            //     width: "140",
-            //    detailData:true,
-            // },
-            // {
-            //   label: "装货港英文名称",
-            //   prop: "polEnName",
-            //     width: "140",
-            //   detailData:true,
-            // },
-            // // {
-            // //   label: "卸货港 id",
-            // //   prop: "podId",
-            // //   rules: [{
-            // //     required: true,
-            // //     message: "请输入卸货港 id",
-            // //     trigger: "blur"
-            // //   }]
-            // // },
-            // {
-            //   label: "卸货港中文名称",
-            //   prop: "podCnName",
-            //     width: "140",
-            //     formslot:true,
-            // },
-            //   {
-            //       label: "卸货港代码",
-            //       prop: "podCode",
-            //       width: "140",
-            //       detailData:true,
-            //   },
-            // {
-            //   label: "卸货港英文名称",
-            //   prop: "podEnName",
-            //     width: "140",
-            //     detailData:true,
-            // },
-            // {
-            //   label: "MB/L NO",
-            //   prop: "mblno",
-            // },
-            // {
-            //   label: "HB/L NO",
-            //     width: "140",
-            //   prop: "hblno",
-            // },
               {
                   label: "箱型",
                   prop: "cntrTypeCode",
@@ -205,41 +145,10 @@ import {
               label: "票数",
               prop: "ticketNumber"
             },
-            // {
-            //   label: "商品 HS-CODE",
-            //   prop: "hscode",
-            //     width: "140",
-            // },
-            // {
-            //   label: "商品简称",
-            //   prop: "commodityShName",
-            // },
-            // {
-            //   label: "商品中文名称",
-            //   prop: "commodityCnName",
-            //     width: "140",
-            // },
-            // {
-            //   label: "商品英文名称",
-            //   prop: "commodityEnName",
-            //     width: "140",
-            // },
-            // {
-            //   label: "提单上货物描述",
-            //   prop: "commodityDescr",
-            //     width: "140",
-            // },
-            // {
-            //   label: "包装单位 Id",
-            //   prop: "packingUnitId",
-            // },
-            // {
-            //   label: "包装单位",
-            //   prop: "packingUnit",
-            // },
             {
               label: "件数",
               prop: "quantity",
+                width: "100",
             },
             {
               label: "毛重(KGM)",
@@ -269,225 +178,11 @@ import {
                 label: "MARKS",
                 prop: "marks",
               },
-            // {
-            //   label: "是否货主自有箱",
-            //   prop: "isSoc",
-            //     width: "140",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入是否货主自有箱 SOC 箱(0 否 1是)",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "是否单程",
-            //   prop: "isOneway",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入是否单程 ONEWAY 箱(0 否 1是)",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "是否加重箱",
-            //   prop: "isHeavy",
-            //     width: "140",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入是否加重箱(0 否 1是)",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "是否冻代干",
-            //   prop: "isNor",
-            //     width: "140",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入是否冻代干(冻柜作为干柜用) NOR(Non Operating Reefer),(0 否 1是)",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "是否通风",
-            //   prop: "isVentilated",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入是否通风,(0 否 1是)",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "是否食品箱",
-            //   prop: "isFood",
-            //     width: "140",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            // },
-            // {
-            //   label: "VGM 称重方法",
-            //   prop: "vgmMethod",
-            //     width: "140",
-            //   // rules: [{
-            //   //   required: true,
-            //   //   message: "请输入VGM 称重方法,SM1, SM2",
-            //   //   trigger: "blur"
-            //   // }]
-            // },
-            // {
-            //   label: "VGM日期",
-            //   prop: "vgmDate",
-            // },
             {
               label: "VGM总重(KGM)",
               prop: "vgmWeight",
                 width: "140",
             },
-            // {
-            //   label: "VGM称重单位名称",
-            //   prop: "vgmWeighName",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM称重地点",
-            //   prop: "vgmWeighAddress",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重联系人",
-            //   prop: "vgmWeighAttn",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重联系人电话",
-            //   prop: "vgmWeighAttnTel",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重联系人邮箱",
-            //   prop: "vgmWeighAttnEmail",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重负责人",
-            //   prop: "vgmWeighMgr",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重负责人签名",
-            //   prop: "vgmWeighMgrSign",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 称重证书",
-            //   prop: "vgmWeighCert",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 发货人单位名称",
-            //   prop: "vgmShipperName",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 发货人地点",
-            //   prop: "vgmShipperAddress",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 发货人联系人",
-            //   prop: "vgmShipperAttn",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 发货人联系人电话",
-            //   prop: "vgmShipperAttnTel",
-            //     width: "150",
-            // },
-            // {
-            //   label: "VGM 发货人联系人邮箱",
-            //   prop: "vgmShipperAttnEmail",
-            //     width: "150",
-            // },
-            // {
-            //   label: "VGM 发货人负责人",
-            //   prop: "vgmShipperMgr",
-            //     width: "140",
-            // },
-            // {
-            //   label: "VGM 发货人负责人签名",
-            //   prop: "vgmShipperMgrSign",
-            //     width: "150",
-            // },
-            // {
-            //   label: "VGM 发货人证书",
-            //   prop: "vgmShipperCert",
-            //     width: "150",
-            // },
-            // {
-            //   label: "状态",
-            //   prop: "status",
-            //     type: "select",
-            //     dicData: [{
-            //         label: '否',
-            //         value: 0
-            //     }, {
-            //         label: '是',
-            //         value: 1
-            //     }],
-            //     value: 0
-            // },
           ]
         },
         data: []
@@ -514,6 +209,33 @@ import {
       created() {
       },
       methods: {
+          // 查询件数是否为零
+          numberfalsefun() {
+              for (let item of this.assemblyForm.containersList) {
+                  if (Number(item.quantity) >= 0) {
+                      return true
+                  }else {
+                      return false
+                  }
+              }
+          },
+          // 平均分配
+          equalDistribution(){
+              if(this.assemblyForm.waitingBoxList.length <= 0) {
+                  this.$message({
+                      type: "warning",
+                      message: "请先添加集装箱数据!"
+                  });
+                  return
+              }
+              this.$confirm("确定平均分配?", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              }).then(()=>{
+                  this.$emit('equalDistribution')
+              })
+          },
           // 编辑
           rowCellfun(row,index){
               this.$delete(row, 'edit')

+ 5 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -425,7 +425,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="16">
-                    <precontainers :assemblyForm="assemblyForm" :pid="assemblyForm.id"></precontainers>
+                    <precontainers :assemblyForm="assemblyForm" :pid="assemblyForm.id" @billsDetailfun="billsDetailfun"></precontainers>
                 </el-col>
             </el-row>
             <el-form-item label="备注" prop="remarks" >
@@ -734,6 +734,10 @@ import {blinesList} from "@/api/iosBasicData/blines";
             this.lineBlinesListfun()
         },
         methods:{
+            // 详情接口
+            billsDetailfun(){
+                this.$emit('billsDetailfun')
+            },
             // 远程搜索
             remoteMethod(value,name){
                 let arr = ['hShipper','hConsignee','hNotify','hNotify2','bookingAgent']

+ 45 - 6
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -27,21 +27,39 @@
         </el-button>
         <el-button type="success" size="small" plain>均分箱量</el-button>
       </template>
+        <template slot-scope="{row}" slot="cntrTypeCodeForm">
+            <search-query :datalist="cntrTypeCodeData"
+                          :selectValue="form.cntrTypeCode"
+                          :filterable="true"
+                          :clearable="true"
+                          :remote="true"
+                          :buttonIf="false"
+                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                          @remoteMethod="remoteMethod($event,'cntrTypeCode')"
+                          @corpChange="corpChange($event,row)" >
+            </search-query>
+        </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
   import {precontainersList, precontainersDetail, precontainersSubmit, precontainersRemove} from "@/api/iosBasicData/ReceivingOrders/precontainers";
+  import {getWorkDicts} from "@/api/system/dictbiz";
   import {mapGetters} from "vuex";
+  import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+  import {bcntrtypesList} from "@/api/iosBasicData/bcntrtypes";
 
   export default {
+      components: {SearchQuery},
       props:{
           pid:{},
           assemblyForm:{},
       },
     data() {
       return {
+          // 集装箱尺码箱型
+          cntrTypeCodeData:[],
         form: {},
         query: {},
         loading: true,
@@ -76,12 +94,8 @@
             {
               label: "集装箱尺码箱型",
               prop: "cntrTypeCode",
+                formslot: true,
               width:'120',
-              rules: [{
-                required: true,
-                message: "请输入集装箱 ISO 尺码箱型",
-                trigger: "blur"
-              }]
             },
             {
               label: "集装箱箱量",
@@ -228,7 +242,30 @@
         return ids.join(",");
       }
     },
-    methods: {
+      created() {
+          this.bcntrtypesListfun()
+      },
+      methods: {
+        // 选择框的回调
+        corpChange(value,row) {
+            for (let item of this.cntrTypeCodeData) {
+                if (item.cnName == value) {
+                    this.$set(this.form,'cntrTypeCode',item.cnName)
+                    this.$set(this.form,'teu',item.teu)
+                }
+            }
+        },
+        // 筛选数据模糊查找
+        remoteMethod(value,name){
+            this.bcntrtypesListfun(value)
+        },
+
+        // 获取箱型字典数据
+        bcntrtypesListfun(cnName){
+           bcntrtypesList(1,10,{cnName}).then(res=>{
+               this.cntrTypeCodeData= res.data.data.records
+           })
+        },
       rowSave(row, done, loading) {
           row.pid = this.pid
         precontainersSubmit(row).then(() => {
@@ -237,6 +274,7 @@
             type: "success",
             message: "操作成功!"
           });
+          this.$emit('billsDetailfun')
           done();
         }, error => {
           loading();
@@ -256,6 +294,7 @@
                           type: "success",
                           message: "操作成功!"
                       });
+                      this.$emit('billsDetailfun')
                       done();
                   })
               }).catch(()=>{

+ 607 - 241
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1,213 +1,472 @@
 <template>
     <div>
-        <el-row :gutter="20">
-            <el-col :span="3">
-                <div class="disabledBox fontSize">
-                    <i class="el-icon-coin"></i>
-                    <span>应收费用</span>
-                </div>
-            </el-col>
-            <el-col :span="4">
-                <el-switch
-                    v-model="value"
-                    active-color="#5972ef"
-                    active-text="审核应收费用"
-                    inactive-color="#949494">
-                </el-switch>
-            </el-col>
-            <el-col :span="6">
-                <div class="disabledBox">
-                    <span style="font-size: 14px;margin-right: 5px">签单方式</span>
-                    <el-select v-model="value" placeholder="请选择" size="small" >
-                        <el-option
-                            v-for="item in options"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </div>
-            </el-col>
-            <el-col :span="8">
-                <el-button type="success" plain size="small">应收账单</el-button>
-                <el-button type="primary" plain size="small">应付账单</el-button>
-                <el-button type="primary" plain size="small">打印账单</el-button>
-                <el-button type="success" plain size="small">应收模板</el-button>
-            </el-col>
-            <el-col :span="3">
-                <el-button type="success" size="small" @click="addDfun">新 增</el-button>
-            </el-col>
-        </el-row>
-        <div style="margin-top: 10px">
-            <el-table
-                :data="tableDataReceivable"
-                @selection-change="handleSelectionChange"
-                style="width: 100%">
-                <el-table-column
-                    type="selection"
-                    fixed="left"
-                    width="55">
-                </el-table-column>
-                <el-table-column
-                    prop="corpCnName"
-                    label="单位" width="160px">
-                    <template slot-scope="{ row }">
-                        <search-query v-if="row.edit"
-                                      :datalist="corpCnNameData"
-                                      :selectValue="row.corpCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="getBcorpsListfun($event,'corpCnName')"
-                                      @corpChange="corpChange($event,'corpCnName',row)" >
-                        </search-query>
-                        <span v-else>{{row.corpCnName}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="feeCnName"
-                    label="费用简称" width="160px">
-                    <template slot-scope="{ row }">
-                        <search-query v-if="row.edit"
-                                      :datalist="feeCnNameData"
-                                      :selectValue="row.feeCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="bfeesListfun($event,'feeCnName')"
-                                      @corpChange="corpChange($event,'feeCnName',row)" >
-                        </search-query>
-                        <span v-else>{{row.feeCnName}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="cntrTypeCode"
-                    label="预付/到付" width="120px">
-                    <template slot-scope="{ row }">
-                        <el-select v-if="row.edit" v-model="row.cntrTypeCode" placeholder="请选择">
+        <!--<div>-->
+        <!--    <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm">-->
+        <!--        <el-row>-->
+        <!--            <el-col :span="6">-->
+        <!--            </el-col>-->
+        <!--        </el-row>-->
+        <!--    </el-form>-->
+        <!--</div>-->
+
+
+        <el-card class="box-card">
+            <el-row :gutter="20">
+                <el-col :span="3">
+                    <div class="disabledBox fontSize">
+                        <i class="el-icon-coin"></i>
+                        <span>应收费用</span>
+                    </div>
+                </el-col>
+                <el-col :span="4">
+                    <el-switch
+                        v-model="value"
+                        active-color="#5972ef"
+                        active-text="审核应收费用"
+                        inactive-color="#949494">
+                    </el-switch>
+                </el-col>
+                <el-col :span="6">
+                    <div class="disabledBox">
+                        <span style="font-size: 14px;margin-right: 5px">签单方式</span>
+                        <el-select v-model="value" placeholder="请选择" size="small" >
                             <el-option
-                                v-for="item in cntrTypeCodeData"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                                v-for="item in issuetypefData"
+                                :key="item.dictKey"
+                                :label="item.dictValue"
+                                :value="item.dictValue">
                             </el-option>
                         </el-select>
-                        <span v-else>{{row.cntrTypeCode}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="unitNo"
-                    label="计量单位" width="120px">
-                    <template slot-scope="{ row }">
-                        <search-query v-if="row.edit"
-                                      :datalist="unitNoData"
-                                      :selectValue="row.unitNo"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="bfeesListfun($event,'unitNo')"
-                                      @corpChange="corpChange($event,'unitNo',row)" >
-                        </search-query>
-                        <span v-else>{{row.unitNo}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="price"
-                    label="单价" width="120px">
-                    <template slot-scope="{ row }">
-                        <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
-                                  placeholder="请输入" @input="priceinputfun(row)"></el-input>
-                        <span v-else>{{row.price}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="quantity"
-                    label="数量" width="120px" >
-                    <template slot-scope="{ row }">
-                        <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
-                                  placeholder="请输入" @input="quantityinputfun(row)"></el-input>
-                        <span v-else>{{row.quantity}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="curCode"
-                    label="币种" width="120px">
-                    <template slot-scope="{ row }">
-                        <search-query v-if="row.edit"
-                                      :datalist="curCodeData"
-                                      :selectValue="row.curCode"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="getRateListfun($event,'curCode')"
-                                      @corpChange="corpChange($event,'curCode',row)" >
-                        </search-query>
-                        <span v-else>{{row.curCode}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="rmbAmount"
-                    label="RMB(含税)">
-                </el-table-column>
-                <el-table-column
-                    prop="usdAmount"
-                    label="USD(含税)">
-                </el-table-column>
-                <el-table-column
-                    prop="exrate"
-                    label="对RMB汇率">
-                </el-table-column>
-                <el-table-column
-                    prop="payplace"
-                    label="预付地址">
-                    <template slot-scope="{ row }">
-                        <el-input v-if="row.edit" v-model="row.payplace" size="small"
-                                  placeholder="请输入" ></el-input>
-                        <span v-else>{{row.payplace}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="remarks"
-                    label="备注">
-                    <template slot-scope="{ row }">
-                        <el-input v-if="row.edit" v-model="row.remarks" size="small"
-                                  placeholder="请输入" ></el-input>
-                        <span v-else>{{row.remarks}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    fixed="right"
-                    label="操作"
-                    width="180">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small">查看</el-button>
-                        <el-button type="text" size="small" @click="editDfun(scope.row,scope.$index)">编辑</el-button>
-                        <el-button type="text" size="small" @click="saveDfun(scope.row,scope.$index)">保存</el-button>
-                        <el-button type="text" size="small" @click="deleteDfun(scope.row,scope.$index)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+                    </div>
+                </el-col>
+                <el-col :span="8">
+                    <el-button type="success" plain size="small">应收账单</el-button>
+                    <el-button type="primary" plain size="small">应付账单</el-button>
+                    <el-button type="primary" plain size="small">打印账单</el-button>
+                    <el-button type="success" plain size="small">应收模板</el-button>
+                </el-col>
+                <el-col :span="3">
+                    <el-button type="success" size="small" @click="addDfun">新 增</el-button>
+                </el-col>
+            </el-row>
+            <div style="margin-top: 10px">
+                <el-table
+                    :row-style="{height:'20px'}"
+                    :cell-style="{padding:'0px'}"
+                    :data="assemblyForm.feeCenterListD"
+                    @selection-change="handleSelectionChange"
+                    style="width: 100%">
+                    <el-table-column
+                        type="selection"
+                        fixed="left"
+                        width="55">
+                    </el-table-column>
+                    <el-table-column
+                        prop="corpCnName"
+                        label="单位" width="160px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="corpCnNameData"
+                                          :selectValue="row.corpCnName"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="getBcorpsListfun($event,'corpCnName')"
+                                          @corpChange="corpChange($event,'corpCnName',row)" >
+                            </search-query>
+                            <span v-else>{{row.corpCnName}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="feeCnName"
+                        label="费用简称" width="160px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="feeCnNameData"
+                                          :selectValue="row.feeCnName"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="bfeesListfun($event,'feeCnName')"
+                                          @corpChange="corpChange($event,'feeCnName',row)" >
+                            </search-query>
+                            <span v-else>{{row.feeCnName}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="paymode"
+                        label="预付/到付" width="120px">
+                        <template slot-scope="{ row }">
+                            <el-select v-if="row.edit" v-model="row.paymode" placeholder="请选择">
+                                <el-option
+                                    v-for="item in paymodeData"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <span v-else>{{paymodefun(row.paymode)}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="unitNo"
+                        label="计量单位" width="120px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="unitNoData"
+                                          :selectValue="row.unitNo"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="bfeesListfun($event,'unitNo')"
+                                          @corpChange="corpChange($event,'unitNo',row)" >
+                            </search-query>
+                            <span v-else>{{row.unitNo}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="price"
+                        label="单价" width="120px">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
+                                      placeholder="请输入" @blur="priceinputfun($event,row)"></el-input>
+                            <span v-else>{{row.price}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="quantity"
+                        label="数量" width="120px" >
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
+                                      placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                            <span v-else>{{row.quantity}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="curCode"
+                        label="币种" width="120px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="curCodeData"
+                                          :selectValue="row.curCode"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="getRateListfun($event,'curCode')"
+                                          @corpChange="corpChange($event,'curCode',row)" >
+                            </search-query>
+                            <span v-else>{{row.curCode}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="rmbAmount"
+                        label="RMB(含税)">
+                    </el-table-column>
+                    <el-table-column
+                        prop="usdAmount"
+                        label="USD(含税)">
+                    </el-table-column>
+                    <el-table-column
+                        prop="exrate"
+                        label="对RMB汇率">
+                    </el-table-column>
+                    <el-table-column
+                        prop="payplace"
+                        label="预付地址">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" v-model="row.payplace" size="small"
+                                      placeholder="请输入" ></el-input>
+                            <span v-else>{{row.payplace}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="remarks"
+                        label="备注">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" v-model="row.remarks" size="small"
+                                      placeholder="请输入" ></el-input>
+                            <span v-else>{{row.remarks}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        fixed="right"
+                        label="操作"
+                        width="100">
+                        <template slot-scope="scope">
+                            <el-button v-if="scope.row.edit" type="text" size="small" @click="saveDfun(scope.row,scope.$index)">保存</el-button>
+                            <el-button v-else type="text" size="small" @click="editDfun(scope.row,scope.$index)">编辑</el-button>
+                            <el-button type="text" size="small" @click="deleteDfun(scope.row,scope.$index)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+
+        <el-card class="box-card" style="margin: 20px 0">
+            <el-row :gutter="20">
+                <el-col :span="3">
+                    <div class="disabledBox meetSize">
+                        <i class="el-icon-coin"></i>
+                        <span>应付费用</span>
+                    </div>
+                </el-col>
+                <el-col :span="4">
+                    <el-switch
+                        v-model="value"
+                        active-color="#5972ef"
+                        active-text="审核应付费用"
+                        inactive-color="#949494">
+                    </el-switch>
+                </el-col>
+                <el-col :span="6">
+                    <div class="disabledBox">
+                        <!--<span style="font-size: 14px;margin-right: 5px">箱量</span>-->
+                        <!--<el-select v-model="value" placeholder="请选择" size="small" >-->
+                        <!--    <el-option-->
+                        <!--        v-for="item in issuetypefData"-->
+                        <!--        :key="item.dictKey"-->
+                        <!--        :label="item.dictValue"-->
+                        <!--        :value="item.dictValue">-->
+                        <!--    </el-option>-->
+                        <!--</el-select>-->
+                    </div>
+                </el-col>
+                <el-col :span="8">
+                    <el-button type="success" plain size="small">应付模板</el-button>
+                </el-col>
+                <el-col :span="3">
+                    <el-button type="success" size="small" @click="addCfun">新 增</el-button>
+                </el-col>
+            </el-row>
+            <div style="margin-top: 10px">
+                <el-table
+                    :data="assemblyForm.feeCenterListC"
+                    @selection-change="handleSelectionChange"
+                    style="width: 100%">
+                    <el-table-column
+                        type="selection"
+                        fixed="left"
+                        width="55">
+                    </el-table-column>
+                    <el-table-column
+                        prop="corpCnName"
+                        label="单位" width="160px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="corpCnNameData"
+                                          :selectValue="row.corpCnName"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="getBcorpsListfun($event,'corpCnName')"
+                                          @corpChange="corpChange($event,'corpCnName',row)" >
+                            </search-query>
+                            <span v-else>{{row.corpCnName}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="feeCnName"
+                        label="费用简称" width="160px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="feeCnNameData"
+                                          :selectValue="row.feeCnName"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="bfeesListfun($event,'feeCnName')"
+                                          @corpChange="corpChange($event,'feeCnName',row)" >
+                            </search-query>
+                            <span v-else>{{row.feeCnName}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="paymode"
+                        label="预付/到付" width="120px">
+                        <template slot-scope="{ row }">
+                            <el-select v-if="row.edit" v-model="row.paymode" placeholder="请选择">
+                                <el-option
+                                    v-for="item in paymodeData"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <span v-else>{{paymodefun(row.paymode)}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="unitNo"
+                        label="计量单位" width="120px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="unitNoData"
+                                          :selectValue="row.unitNo"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="bfeesListfun($event,'unitNo')"
+                                          @corpChange="corpChange($event,'unitNo',row)" >
+                            </search-query>
+                            <span v-else>{{row.unitNo}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="price"
+                        label="单价" width="120px">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
+                                      placeholder="请输入" @blur="priceinputfun($event,row)"></el-input>
+                            <span v-else>{{row.price}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="quantity"
+                        label="数量" width="120px" >
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
+                                      placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
+                            <span v-else>{{row.quantity}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="curCode"
+                        label="币种" width="120px">
+                        <template slot-scope="{ row }">
+                            <search-query v-if="row.edit"
+                                          :datalist="curCodeData"
+                                          :selectValue="row.curCode"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :remote="true"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                          @remoteMethod="getRateListfun($event,'curCode')"
+                                          @corpChange="corpChange($event,'curCode',row)" >
+                            </search-query>
+                            <span v-else>{{row.curCode}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="rmbAmount"
+                        label="RMB(含税)">
+                    </el-table-column>
+                    <el-table-column
+                        prop="usdAmount"
+                        label="USD(含税)">
+                    </el-table-column>
+                    <el-table-column
+                        prop="exrate"
+                        label="对RMB汇率">
+                    </el-table-column>
+                    <el-table-column
+                        prop="payplace"
+                        label="预付地址">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" v-model="row.payplace" size="small"
+                                      placeholder="请输入" ></el-input>
+                            <span v-else>{{row.payplace}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="remarks"
+                        label="备注">
+                        <template slot-scope="{ row }">
+                            <el-input v-if="row.edit" v-model="row.remarks" size="small"
+                                      placeholder="请输入" ></el-input>
+                            <span v-else>{{row.remarks}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        fixed="right"
+                        label="操作"
+                        width="100">
+                        <template slot-scope="scope">
+                            <el-button v-if="scope.row.edit" type="text" size="small" @click="saveCfun(scope.row,scope.$index)">保存</el-button>
+                            <el-button v-else type="text" size="small" @click="editCfun(scope.row,scope.$index)">编辑</el-button>
+                            <el-button type="text" size="small" @click="deleteDfun(scope.row,scope.$index)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+
+        <div style="display: flex;align-items: center;justify-content: space-around">
+            <div style="width: 30%">
+                <el-card class="box-card">
+                    <div class="bottomFlex">
+                        <div class="bottomFlex-left">
+                            <div class="bottomFlex-leftTop">
+                                <div class="weightfont">¥</div>
+                                <div class="fontText">人民币</div>
+                                <div class="fontText">RMB</div>
+                            </div>
+                            <div class="bottomFlex-leftcont">
+                                <div style="color: #81B337">
+                                    <div>应收</div>
+                                    <span class="weightnum">¥295665.55元</span>
+                                </div>
+                                <div style="color: #6BBCD1">
+                                    <div>应付</div>
+                                    <span class="weightnum">¥295665.55元</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="height: 90px; border-right: 1px solid #cbcbcb"></div>
+                        <div class="bottomFlex-right">
+                            <div class="fontText positionText">利润</div>
+                            <div class="weightnum">¥95665.55元</div>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
 
-            <el-pagination
-                background
-                layout="prev, pager, next"
-                :page-size="pageD.size"
-                :current-page="pageD.current"
-                :total="pageD.total"
-                @size-change="DsizeChange"
-                @current-change="DcurrentChange" >
-            </el-pagination>
+            <div style="width: 30%">
+                <el-card class="box-card">
+                    <div class="bottomFlex">
+                        <div class="bottomFlex-left">
+                            <div class="bottomFlex-leftTop">
+                                <div class="weightfont">$</div>
+                                <div class="fontText">美金</div>
+                                <div class="fontText">USD</div>
+                            </div>
+                            <div class="bottomFlex-leftcont">
+                                <div style="color: #81B337">
+                                    <div>应收</div>
+                                    <span class="weightnum">$295665.55元</span>
+                                </div>
+                                <div style="color: #6BBCD1">
+                                    <div>应付</div>
+                                    <span class="weightnum">$295665.55元</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="height: 90px; border-right: 1px solid #cbcbcb"></div>
+                        <div class="bottomFlex-right">
+                            <div class="fontText positionText">利润</div>
+                            <div class="weightnum">$95665.55元</div>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
 
         </div>
     </div>
+
 </template>
 
 <script>
@@ -216,25 +475,32 @@
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsList} from "@/api/iosBasicData/bunits";
     import {getRateList} from "@/api/iosBasicData/rateManagement";
-    import {feecenterList, feecenterSubmit} from "@/api/iosBasicData/feecenter";
+    import {feecenterList, feecenterRemove, feecenterSubmit} from "@/api/iosBasicData/feecenter";
+    import {getWorkDicts} from "@/api/system/dictbiz";
 
     export default {
         components: {SearchQuery},
         props:{
             pid:{
 
+            },
+            assemblyForm:{
+                type:Object
             }
         },
         data(){
             return {
+                // 签单方式
+                issuetypefData:[],
                 value:'',
-                tableDataReceivable:[],
+                feeCenterListD:[], // 收
+                feeCenterListC:[], // 付
                 // 客户数据
                 corpCnNameData:[],
                 // 费用数据
                 feeCnNameData:[],
                 // 预付到付数据
-                cntrTypeCodeData:[
+                paymodeData:[
                     {
                         label:'预付',
                         value:'PP'
@@ -248,21 +514,14 @@
                 unitNoData:[],
                 // 币别数据
                 curCodeData:[],
-                // 应收的分页
-                pageD:{
-                    current:1,
-                    size:10,
-                    total:0
-                },
             }
         },
         created() {
-            this.feecenterListfun()
-
             this.getBcorpsListfun()
             this.bfeesListfun()
             this.getBunitsListfun()
             this.getRateListfun()
+            this.getWorkDictsfun()
         },
         methods:{
             // 应收新增
@@ -274,13 +533,32 @@
                     });
                     return
                 }
-                this.tableDataReceivable.push({
+                this.assemblyForm.feeCenterListD.push({
+                    edit:true
+                })
+            },
+            // 应付新增
+            addCfun(){
+                if (!this.pid) {
+                    this.$message({
+                        message: '请先保存数据之后才能添加',
+                        type: 'warning'
+                    });
+                    return
+                }
+                this.assemblyForm.feeCenterListC.push({
                     edit:true
                 })
             },
             // 应收编辑
             editDfun(row,index){
-                this.tableDataReceivable[index].edit = false
+                this.$delete(this.assemblyForm.feeCenterListD[index], 'edit')
+                this.$set(this.assemblyForm.feeCenterListD[index],'edit',true)
+            },
+            // 应付编辑
+            editCfun(row,index){
+                this.$delete(this.assemblyForm.feeCenterListC[index], 'edit')
+                this.$set(this.assemblyForm.feeCenterListC[index],'edit',true)
             },
             // 应收保存
             saveDfun(row,index){
@@ -288,11 +566,36 @@
                 row.dc = 'D'
                 row.pid = this.pid
                 row.sort = index
+                row.billType = this.assemblyForm.billType
+                row.billNo = this.assemblyForm.billNo
+                this.feecenterSubmitfun(row)
+            },
+            // 应付保存
+            saveCfun(row,index){
+                // 收付 D=收 C=付
+                row.dc = 'C'
+                row.pid = this.pid
+                row.sort = index
+                row.billType = this.assemblyForm.billType
+                row.billNo = this.assemblyForm.billNo
                 this.feecenterSubmitfun(row)
             },
             // 应收删除
             deleteDfun(row,index) {
-
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(()=>{
+                    // 删除接口
+                    feecenterRemove(row.id).then(res=>{
+                        this.$message({
+                            type: "success",
+                            message: "操作成功!"
+                        });
+                        this.$emit('billsDetailfun')
+                    })
+                })
             },
             // 客户的回调
             corpChange(value,name,row) {
@@ -334,8 +637,8 @@
 
             },
             // 单价
-            priceinputfun(row){
-                if (row.price <= 0) {
+            priceinputfun(value,row){
+                if (Number(value) <= 0) {
                     this.$message({
                         type: "warning",
                         message: "单价不能输入负数!"
@@ -343,6 +646,17 @@
                     return
                 }
                 this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
+                // 判断是否有币种
+                if (!row.curCode) {
+                    return;
+                }
+                if (row.curCode == 'CNY') {
+                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'usdAmount','')
+                }else {
+                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'rmbAmount','')
+                }
             },
             // 数量
             quantityinputfun(row) {
@@ -354,35 +668,28 @@
                     return
                 }
                 this.$set(row,'amount',Number(row.price?row.price:0) * Number(row.quantity))
-            },
-            // 获取列表数据
-            feecenterListfun(){
-                feecenterList(this.pageD.current,this.pageD.size,{pid:this.pid}).then(res=>{
-                    this.tableDataReceivable = res.data.data.records.map(item=>{
-                        if (item.curCode == 'CNY') {
-                            this.$set(item,'rmbAmount',item.amount)
-                            this.$set(item,'usdAmount','')
-                        }else {
-                            this.$set(item,'usdAmount',item.amount)
-                            this.$set(item,'rmbAmount','')
-                        }
-                        return item
-                    })
-                })
+                // 判断是否有币种
+                if (!row.curCode) {
+                    return;
+                }
+                if (row.curCode == 'CNY') {
+                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'usdAmount','')
+                }else {
+                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'rmbAmount','')
+                }
             },
             // 保存接口
             feecenterSubmitfun(row){
                 feecenterSubmit(row).then(res=>{
-                    console.log(res,359)
+                    this.$message({
+                        type: "success",
+                        message: "操作成功!"
+                    });
+                    this.$emit('billsDetailfun')
                 })
             },
-            // 应收分页
-            DcurrentChange(e){
-                console.log(e,'current')
-            },
-            DsizeChange(e){
-                console.log(e,'size')
-            },
             // 获取客户数据
             getBcorpsListfun(cnName){
                 getBcorpsList(1,10,{cnName}).then(res=>{
@@ -407,13 +714,27 @@
                     this.curCodeData = res.data.data.records
                 })
             },
+            // 获取签单方式字典数据
+            getWorkDictsfun(){
+                getWorkDicts('issue_type_F').then(res=>{
+                    this.issuetypefData = res.data.data
+                })
+            },
+            // 预付到付货物显示值
+            paymodefun(value){
+                for(let item of this.paymodeData) {
+                    if (item.value == value) {
+                        return item.label
+                    }
+                }
+            },
 
 
         },
     }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
     .disabledBox {
         display: flex;
         align-items: center;
@@ -422,4 +743,49 @@
         font-size: 16px;
         color: #81B337;
     }
+    .meetSize {
+        font-size: 16px;
+        color: #54BCBD;
+    }
+    .bottomFlex {
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+        .bottomFlex-left {
+            display: flex;
+            align-items: center;
+            .bottomFlex-leftTop {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                padding-right: 15px;
+                border-right: 1px solid #cbcbcb;
+            }
+            .bottomFlex-leftcont {
+                margin: 0 30px;
+            }
+        }
+        .bottomFlex-right {
+            position: relative;
+            .positionText {
+                position: absolute;
+                top: -45px;
+                left: 50%;
+                transform: translateX(-50%);
+            }
+        }
+    }
+    .weightfont {
+        font-size: 20px;
+        font-weight: bold;
+    }
+    .weightnum {
+        font-size: 15px;
+        font-weight: 500;
+    }
+    .fontText {
+        font-size: 16px;
+        font-weight: 500;
+        margin: 3px 0;
+    }
 </style>

+ 180 - 138
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -16,150 +16,181 @@
                 </el-button>
             </div>
         </div>
-        <div class="customer-main">
-            <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
-                <containerTitle title="基础资料"></containerTitle>
-                <basic-container :showBtn="true">
-                    <el-row :gutter="60">
-                        <el-col v-for="(item, index) in basicData.column" :key="index" :span="8">
-                            <!--数组-->
-                            <div v-if="item instanceof Array" style="display: flex;align-items: center;justify-content: space-between">
-                                <el-form-item :label="item[0].label" :prop="item[0].prop" :rules="item[0].rules"
-                                              :label-width="item[0].labelWidth">
-                                    <el-button v-if="item[0].type == 'button'" :disabled="item[0].disabled"
-                                               size="small" type="success" plain @click="applyforfun(item[0].label)" >
-                                        {{item[0].label}}
-                                    </el-button>
-                                    <search-query v-else-if="item[0].type == 'select'"
-                                                  :datalist="item[0].dicData"
-                                                  :selectValue="form[item[0].prop]"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || item[0].disabled"
-                                                  :buttonIf="false"
-                                                  :forParameter="item[0].forParameter"
-                                                  @remoteMethod="remoteMethod($event,item[0].prop)"
-                                                  @corpChange="corpChange($event,item[0].prop)" >
-                                    </search-query>
-                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled || item[0].disabled"
-                                              clearable :placeholder="'请输入' + item[0].label" ></el-input>
-                                </el-form-item>
 
-                                <el-form-item :label="item[1].label" :prop="item[1].prop" :rules="item[1].rules"
-                                              :label-width="item[1].labelWidth">
-                                    <el-date-picker v-if="item[1].type == 'date'"
-                                        v-model="form[item[1].prop]" clearable
-                                        type="date" size="small" :disabled="detailData.seeDisabled || item[1].disabled"
-                                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="选择日期">
-                                    </el-date-picker>
-                                    <search-query v-else-if="item[1].type == 'select'"
-                                                  :datalist="item[1].dicData"
-                                                  :selectValue="form[item[1].prop]"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || item[1].disabled"
-                                                  :buttonIf="false"
-                                                  :forParameter="item[1].forParameter"
-                                                  @remoteMethod="remoteMethod($event,item[1].prop)"
-                                                  @corpChange="corpChange($event,item[1].prop)" >
-                                    </search-query>
-                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled || item[1].disabled"
-                                              clearable :placeholder="'请输入' + item[1].label" ></el-input>
-                                </el-form-item>
+        <div style="margin-top: 65px">
+            <el-tabs type="border-card">
+                <el-tab-pane label="委托信息">
+                    <div>
+                        <div>
+                            <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
+                                <containerTitle title="基础资料"></containerTitle>
+                                <basic-container :showBtn="true">
+                                    <el-row :gutter="60">
+                                        <el-col v-for="(item, index) in basicData.column" :key="index" :span="8">
+                                            <!--数组-->
+                                            <div v-if="item instanceof Array" style="display: flex;align-items: center;justify-content: space-between">
+                                                <el-form-item :label="item[0].label" :prop="item[0].prop" :rules="item[0].rules"
+                                                              :label-width="item[0].labelWidth">
+                                                    <span slot="label" v-if="item[0].label">
+                                                        <span style="color: #1e9fff">{{item[0].label}}</span>
+                                                    </span>
+                                                    <el-button v-if="item[0].type == 'button'" :disabled="item[0].disabled"
+                                                               size="small" type="success" plain @click="applyforfun(item[0].label)" >
+                                                        {{item[0].label}}
+                                                    </el-button>
+                                                    <search-query v-else-if="item[0].type == 'select'"
+                                                                  :datalist="item[0].dicData"
+                                                                  :selectValue="form[item[0].prop]"
+                                                                  :filterable="true"
+                                                                  :clearable="true"
+                                                                  :remote="true"
+                                                                  :disabled="detailData.seeDisabled || item[0].disabled"
+                                                                  :buttonIf="false"
+                                                                  :forParameter="item[0].forParameter"
+                                                                  @remoteMethod="remoteMethod($event,item[0].prop)"
+                                                                  @corpChange="corpChange($event,item[0].prop)" >
+                                                    </search-query>
+                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
+                                                              size="small" autocomplete="off"
+                                                              :disabled="detailData.seeDisabled || item[0].disabled"
+                                                              clearable :placeholder="'请输入' + item[0].label" ></el-input>
+                                                </el-form-item>
 
-                                <el-form-item v-if="item[2]" :label="item[2].label" :prop="item[2].prop" :rules="item[2].rules"
-                                              :label-width="item[2].labelWidth">
-                                    <search-query v-if="item[2].type == 'select'"
-                                                  :datalist="item[2].dicData"
-                                                  :selectValue="form[item[2].prop]"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || item[2].disabled"
-                                                  :buttonIf="false"
-                                                  :forParameter="item[1].forParameter"
-                                                  @remoteMethod="remoteMethod($event,item[2].prop)"
-                                                  @corpChange="corpChange($event,item[2].prop)" >
-                                    </search-query>
-                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled || item[1].disabled"
-                                              clearable :placeholder="'请输入' + item[2].label" ></el-input>
-                                </el-form-item>
-                            </div>
-                            <!--对象-->
-                            <div v-else>
-                                <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                    <search-query v-if="item.type == 'select'"
-                                                  :datalist="item.dicData"
-                                                  :selectValue="form[item.prop]"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || item.disabled"
-                                                  :buttonIf="item.buttonIf"
-                                                  :forParameter="item.forParameter"
-                                                  @remoteMethod="remoteMethod($event,item.prop)"
-                                                  @corpChange="corpChange($event,item.prop)" >
-                                        <bcorps v-if="item.slot == 'bcorps'"></bcorps>
-                                        <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'"></bcorpstypedefine>
-                                    </search-query>
-                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled || item.disabled"
-                                              clearable :placeholder="'请输入' + item.label" ></el-input>
-                                </el-form-item>
-                            </div>
+                                                <el-form-item :label="item[1].label" :prop="item[1].prop" :rules="item[1].rules"
+                                                              :label-width="item[1].labelWidth">
+                                                    <span slot="label" v-if="item[1].label">
+                                                        <span style="color: #1e9fff">{{item[1].label}}</span>
+                                                    </span>
+                                                    <el-date-picker v-if="item[1].type == 'date'"
+                                                                    v-model="form[item[1].prop]" clearable style="width: 100%;"
+                                                                    type="date" size="small" :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                                                    placeholder="选择日期">
+                                                    </el-date-picker>
+                                                    <search-query v-else-if="item[1].type == 'select'"
+                                                                  :datalist="item[1].dicData"
+                                                                  :selectValue="form[item[1].prop]"
+                                                                  :filterable="true"
+                                                                  :clearable="true"
+                                                                  :remote="true"
+                                                                  :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                  :buttonIf="false"
+                                                                  :forParameter="item[1].forParameter"
+                                                                  @remoteMethod="remoteMethod($event,item[1].prop)"
+                                                                  @corpChange="corpChange($event,item[1].prop)" >
+                                                    </search-query>
+                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
+                                                              size="small" autocomplete="off"
+                                                              :disabled="detailData.seeDisabled || item[1].disabled"
+                                                              clearable :placeholder="'请输入' + item[1].label" ></el-input>
+                                                </el-form-item>
 
-                        </el-col>
+                                                <el-form-item v-if="item[2]" :label="item[2].label" :prop="item[2].prop" :rules="item[2].rules"
+                                                              :label-width="item[2].labelWidth">
+                                                    <span slot="label" v-if="item[2].label">
+                                                        <span style="color: #1e9fff">{{item[2].label}}</span>
+                                                    </span>
+                                                    <search-query v-if="item[2].type == 'select'"
+                                                                  :datalist="item[2].dicData"
+                                                                  :selectValue="form[item[2].prop]"
+                                                                  :filterable="true"
+                                                                  :clearable="true"
+                                                                  :remote="true"
+                                                                  :disabled="detailData.seeDisabled || item[2].disabled"
+                                                                  :buttonIf="false"
+                                                                  :forParameter="item[1].forParameter"
+                                                                  @remoteMethod="remoteMethod($event,item[2].prop)"
+                                                                  @corpChange="corpChange($event,item[2].prop)" >
+                                                    </search-query>
+                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
+                                                              size="small" autocomplete="off"
+                                                              :disabled="detailData.seeDisabled || item[1].disabled"
+                                                              clearable :placeholder="'请输入' + item[2].label" ></el-input>
+                                                </el-form-item>
+                                            </div>
+                                            <!--对象-->
+                                            <div v-else>
+                                                <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                                                    <span slot="label" v-if="item.label">
+                                                        <span style="color: #1e9fff">{{item.label}}</span>
+                                                    </span>
+                                                    <search-query v-if="item.type == 'select'"
+                                                                  :datalist="item.dicData"
+                                                                  :selectValue="form[item.prop]"
+                                                                  :filterable="true"
+                                                                  :clearable="true"
+                                                                  :remote="true"
+                                                                  :disabled="detailData.seeDisabled || item.disabled"
+                                                                  :buttonIf="item.buttonIf"
+                                                                  :forParameter="item.forParameter"
+                                                                  @remoteMethod="remoteMethod($event,item.prop)"
+                                                                  @corpChange="corpChange($event,item.prop)" >
+                                                        <bcorps v-if="item.slot == 'bcorps'"></bcorps>
+                                                        <bcorpstypedefine v-if="item.slot == 'bcorpstypedefine'"></bcorpstypedefine>
+                                                    </search-query>
+                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
+                                                              size="small" autocomplete="off"
+                                                              :disabled="detailData.seeDisabled || item.disabled"
+                                                              clearable :placeholder="'请输入' + item.label" ></el-input>
+                                                </el-form-item>
+                                            </div>
 
-                    </el-row>
-                </basic-container>
-            </el-form>
-        </div>
-        <div class="customer-main margintop">
-            <containerTitle title="详细"></containerTitle>
-            <basic-container :showBtn="true">
-                <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-                    <el-tab-pane label="委托信息" name="first">
-                        <entrustment-lnformation :assemblyForm="form" :detailData="detailData"></entrustment-lnformation>
-                    </el-tab-pane>
-                    <el-tab-pane label="MB/L信息" name="second">
-                        <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
-                    </el-tab-pane>
-                    <el-tab-pane label="配箱" name="third">
-                        <DistributionBox :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></DistributionBox>
-                    </el-tab-pane>
-                    <el-tab-pane label="单证中心" name="fourth">单证中心</el-tab-pane>
-                    <el-tab-pane label="费用" name="fifth">
-                        <feecenter :pid="form.id"></feecenter>
-                    </el-tab-pane>
-                    <el-tab-pane label="EDI CODE" name="sixth">
-                        <edicode :assemblyForm="form" :detailData="detailData"></edicode>
-                    </el-tab-pane>
-                    <el-tab-pane label="文件中心" name="seventh">
-                        <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
-                    </el-tab-pane>
-                    <el-tab-pane label="分单列表" name="eighth">
-                        <Split-list :detailData="detailData" :assemblyForm="form"
-                                    :data="billsListAllData"
-                                    @billsListAllfun="billsListAllfun(this.form.id)"></Split-list>
-                    </el-tab-pane>
-                </el-tabs>
-            </basic-container>
-            <basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'second'">
-                <formbottom :assemblyForm="form" :detailData="detailData"></formbottom>
-            </basic-container>
+                                        </el-col>
+
+                                    </el-row>
+                                </basic-container>
+                            </el-form>
+                        </div>
+                        <div class="customer-main margintop">
+                            <containerTitle title="详细"></containerTitle>
+                            <basic-container :showBtn="true">
+                                <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+                                    <el-tab-pane label="委托详情" name="first">
+                                        <entrustment-lnformation :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></entrustment-lnformation>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="配箱处理" name="second">
+                                        <DistributionBox :assemblyForm="form" :detailData="detailData" @billsDetailfun="billsDetailfun(form.id)"></DistributionBox>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="MB/L信息" name="third">
+                                        <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="单证中心" name="fourth">单证中心</el-tab-pane>
+                                    <!--<el-tab-pane label="费用" name="fifth">-->
+                                    <!--    <feecenter :assemblyForm="form" :pid="form.id"-->
+                                    <!--               @billsDetailfun="billsDetailfun(form.id)"></feecenter>-->
+                                    <!--</el-tab-pane>-->
+                                    <el-tab-pane label="EDI CODE" name="sixth">
+                                        <edicode :assemblyForm="form" :detailData="detailData"></edicode>
+                                    </el-tab-pane>
+                                    <el-tab-pane label="文件中心" name="seventh">
+                                        <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
+                                    </el-tab-pane>
+                                    <!--<el-tab-pane label="分单列表" name="eighth">-->
+                                    <!--    <Split-list :detailData="detailData" :assemblyForm="form"-->
+                                    <!--                :data="billsListAllData"-->
+                                    <!--                @billsListAllfun="billsListAllfun(this.form.id)"></Split-list>-->
+                                    <!--</el-tab-pane>-->
+                                </el-tabs>
+                            </basic-container>
+                            <basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'third'">
+                                <formbottom :assemblyForm="form" :detailData="detailData"></formbottom>
+                            </basic-container>
 
+                        </div>
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane label="费用信息">
+                    <feecenter :assemblyForm="form" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                </el-tab-pane>
+                <el-tab-pane label="分单列表">
+                    <Split-list :detailData="detailData" :assemblyForm="form"
+                                :data="billsListAllData"
+                                @billsListAllfun="billsListAllfun(this.form.id)"></Split-list>
+                </el-tab-pane>
+            </el-tabs>
         </div>
 
+
     </div>
 </template>
 
@@ -207,7 +238,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
             return {
                 // 分单列表数据
                 billsListAllData:[],
-                pageLoading:true,
+                pageLoading:false,
                 saveLoading:false,
                 form:{
                     billType:'DD',
@@ -851,6 +882,17 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                     this.$set(item,'editMeasurement',item.measurement)
                     this.$set(item,'edit',false)
                 }
+                // 应收应付
+                for(let item of this.form.feeCenterListD) {
+                    if (item.curCode == 'CNY') {
+                        this.$set(item,'rmbAmount',item.amount)
+                        this.$set(item,'usdAmount','')
+                    }else {
+                        this.$set(item,'usdAmount',item.amount)
+                        this.$set(item,'rmbAmount','')
+                    }
+                    item.edit = false
+                }
             },
             // tbas切换
             handleClick(tba,event) {

+ 7 - 8
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -56,15 +56,14 @@
                       <small slot="more">...</small>
                   </avue-text-ellipsis>
               </template>
-              <template slot="expand" slot-scope="{row}">
-                  <SplitList :typeMenu="true" :data="row.billsListAllData" ></SplitList>
+              <template slot="expand" slot-scope="{row}" >
+                  <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading" ></SplitList>
               </template>
           </avue-crud>
       </basic-container>
 
       <bills-details ref="billsDetails" v-if="!isShow" :detailData="detailData" @goBack="goBack"></bills-details>
 
-
       <el-dialog
           title="主单列表"
           :visible.sync="dialogVisible"
@@ -124,6 +123,8 @@ import fa from "element-ui/src/locale/lang/fa";
         loading: true,
           // 弹窗加载
           mawbloading:false,
+          // 下拉的加载
+          SplitLoading:false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -613,16 +614,13 @@ import fa from "element-ui/src/locale/lang/fa";
         // 下拉显示数据
         async expandChange(row){
             if (row.billType == 'MM') {
+                this.SplitLoading = true
                 const res = await billsListAll({masterId:row.id})
                 this.$set(row,'billsListAllData',res.data.data)
-                this.$refs.crud.toggleRowExpansion(row,true)
+                this.SplitLoading = false
             }else {
                 this.$refs.crud.toggleRowExpansion(row,false)
             }
-
-
-            // this.toggleRowExpansion
-
         },
         // 弹窗单选
         radioInput(row){
@@ -684,6 +682,7 @@ import fa from "element-ui/src/locale/lang/fa";
             };
             this.isShow = false
             this.$nextTick(()=>{
+                this.$refs.billsDetails.pageLoading = true
                 this.$refs.billsDetails.billsDetailfun(row.id)
             })
         },