货代 11.13

src/api/iosBasicData/finstlbills.js

@@ -40,11 +40,13 @@ export const finstlbillsSubmit = (row) => {
   })
 }
 
-export const update = (row) => {
+
+// 检索
+export const finstlbillsListAccBill = (params) => {
   return request({
-    url: '/api/blade-los/finstlbills/submit',
-    method: 'post',
-    data: row
+    url: '/api/blade-los/finaccbills/listAccBill',
+    method: 'get',
+    params: params
   })
 }
 

src/components/basic-container/expand.vue

@@ -0,0 +1,118 @@
+<template>
+  <div
+    class="basic-container"
+    :style="styleName"
+    :class="{ 'basic-container--block': block }"
+  >
+    <div class="basic-container__card" style="min-height: 20px">
+      <div v-show="show">
+        <slot></slot>
+      </div>
+      <div v-if="showBtn" class="basic-container-foot" @mouseenter="enter" @mouseleave="leave">
+        <div v-show="show" style="height: 20px" @click="show = !show">
+          <span class="el-button--text"><i class="el-icon-caret-top" /><span v-show="showSpan">隐藏</span></span>
+        </div>
+        <div v-show="!show" style="height: 20px" @click="show = !show">
+          <span class="el-button--text"><i class="el-icon-caret-bottom" /><span v-show="showSpan">显示</span></span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "basicContainer",
+  data() {
+    return {
+      // show: false,
+      // showSpan: true
+    };
+  },
+  props: {
+    radius: {
+      type: [String, Number],
+      default: 10
+    },
+    background: {
+      type: String
+    },
+    block: {
+      type: Boolean,
+      default: false
+    },
+    showBtn: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示文字
+    showSpan: {
+      type: Boolean,
+      default: false
+    },
+    // 是否默认展开
+    show: {
+      type: Boolean,
+      default: false
+    },
+
+  },
+  methods: {
+    // 事件监听器 当鼠标进入该区域时，会触发 方法
+    enter() {
+        if (!this.showSpan) {
+            this.showSpan = true;
+        }
+
+    },
+    // 事件监听器 当鼠标离开该区域时，会触发方法
+    leave() {
+        if (!this.showSpan) {
+            this.showSpan = false;
+        }
+
+    }
+  },
+  computed: {
+    styleName() {
+      return {
+        borderRadius: this.setPx(this.radius),
+        background: this.background
+      };
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.basic-container {
+  padding: 5px 6px;
+  box-sizing: border-box;
+  &--block {
+    height: 100%;
+    .basic-container__card {
+      height: 100%;
+    }
+  }
+  &__card {
+    width: 100%;
+  }
+  &:first-child {
+    padding-top: 6px;
+  }
+  &-foot {
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #d3dce6;
+    span {
+      margin-left: 4px;
+      font-size: 14px;
+    }
+  }
+  &-foot:hover {
+    color: #409eff;
+  }
+}
+</style>

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

@@ -0,0 +1,296 @@
+<template>
+    <div>
+        <el-table
+            :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+            :cell-style="{padding:'0px',fontSize:'12px'}"
+            :header-cell-style="tableHeaderCellStyle"
+            :data="tableData"
+            border
+            style="width: 100%"
+            @selection-change="handleSelectionChange" >
+            <el-table-column
+                type="selection"
+                width="55">
+            </el-table-column>
+            <el-table-column
+                prop="lineNo"
+                label="行号">
+            </el-table-column>
+            <el-table-column
+                prop="lineNo"
+                label="源业务编号" width="120px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" v-if="row.businessBillDivideNo">{{row.businessBillDivideNo}}</span>
+                    <span class="textHide" v-else>{{row.businessBillNo}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="invoiceNo"
+                label="发票号">
+            </el-table-column>
+            <el-table-column
+                prop="corpCnName"
+                label="结算单位" width="130px">
+                <template slot-scope="{ row }">
+                    <avue-text-ellipsis :text="row.corpCnName" :height="50" :width="130">
+                        <small slot="more">...</small>
+                    </avue-text-ellipsis>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="mblno"
+                label="MB/L NO" width="120px">
+                <template slot-scope="{ row }">
+                    <avue-text-ellipsis :text="row.mblno" :height="50" :width="120">
+                        <small slot="more">...</small>
+                    </avue-text-ellipsis>
+                </template>
+            </el-table-column>
+            <el-table-column label="本地结算金额">
+                <!--amount-->
+                <el-table-column
+                    prop="amountRMB"
+                    label="RMB">
+                </el-table-column>
+                <el-table-column
+                    prop="amountUSD"
+                    label="USD">
+                </el-table-column>
+            </el-table-column>
+            <el-table-column
+                prop="currentStlExrate"
+                label="汇率">
+            </el-table-column>
+            <el-table-column
+                prop="exrate"
+                label="选择">
+            </el-table-column>
+            <el-table-column
+                prop="isChecked"
+                label="对账">
+            </el-table-column>
+            <el-table-column
+                prop="isSignfor"
+                label="签收">
+            </el-table-column>
+            <el-table-column
+                prop="isInvoice"
+                label="发票状态">
+            </el-table-column>
+            <el-table-column
+                prop="etd"
+                label="ETD" width="150px">
+                <template slot-scope="{ row }">
+                    <span>{{row.etd}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="accBillNo"
+                label="账单编号">
+            </el-table-column>
+
+            <el-table-column
+                prop="signforName"
+                label="签收人">
+            </el-table-column>
+            <el-table-column
+                prop="signforDate"
+                label="签收日期">
+            </el-table-column>
+
+            <el-table-column
+                prop="billDate"
+                label="销账日期" width="150px">
+                <template slot-scope="{ row }">
+                    <span>{{row.etd}}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column
+                prop="accBillNo"
+                label="操作">
+            </el-table-column>
+            <el-table-column
+                prop="bookingNo"
+                label="BOOKINGNO" width="150px">
+                <template slot-scope="{ row }">
+                    <span>{{row.bookingNo}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="hblno"
+                label="HB/L NO" width="150px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.hblno}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="vesselCnName"
+                label="船名">
+            </el-table-column>
+            <el-table-column
+                prop="voyageNo"
+                label="航次" width="100px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.voyageNo}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="发票">
+                <!--currentInvoiceAmount-->
+                <el-table-column
+                    prop="currentInvoiceAmountRMB"
+                    label="RMB">
+                </el-table-column>
+                <el-table-column
+                    prop="currentInvoiceAmountUSD"
+                    label="USD">
+                </el-table-column>
+            </el-table-column>
+            <el-table-column
+                prop="quantityCntrTypesDescr"
+                label="箱型">
+            </el-table-column>
+            <el-table-column
+                prop="quantityCntrTypesDescr"
+                label="箱量">
+            </el-table-column>
+            <el-table-column
+                prop="billNo"
+                label="编号" width="100px">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.billNo}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="dc"
+                label="收/付">
+            </el-table-column>
+            <el-table-column label="应结算金额">
+                <!--unsettledAmount-->
+                <el-table-column
+                    prop="unsettledAmountRMB"
+                    label="RMB">
+                </el-table-column>
+                <el-table-column
+                    prop="unsettledAmountUSD"
+                    label="USD">
+                </el-table-column>
+            </el-table-column>
+            <el-table-column label="已结算金额">
+                <!--stlTtlAmount-->
+                <el-table-column
+                    prop="stlTtlAmountRMB"
+                    label="RMB">
+                </el-table-column>
+                <el-table-column
+                    prop="stlTtlAmountUSD"
+                    label="USD">
+                </el-table-column>
+            </el-table-column>
+            <el-table-column
+                prop="voyageNo"
+                label="结算单号">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.voyageNo}}</span>
+                </template>
+            </el-table-column>
+            <!--paymode-->
+            <el-table-column
+                prop="paymodeH"
+                label="H付费方式">
+            </el-table-column>
+            <el-table-column
+                prop="paymodeM"
+                label="M付费方式">
+            </el-table-column>
+
+            <el-table-column
+                prop="eta"
+                label="ETA">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.voyageNo}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="eta"
+                label="三检单号">
+                <template slot-scope="{ row }">
+                    <span class="textHide" >{{row.voyageNo}}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column label="本次结算金额">
+                <!--默认应结算 可以修改-->
+                <!--currentStlAmount-->
+                <el-table-column
+                    prop="currentStlAmountRMB"
+                    label="RMB">
+                    <template slot-scope="scope">
+                        <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
+                                  size="mini" autocomplete="off"
+                                  clearable placeholder="请输入USD" >
+                        </el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    prop="currentStlAmountUSD"
+                    label="USD" width="150px">
+                    <template slot-scope="scope">
+                        <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD"
+                                  size="mini" autocomplete="off"
+                                  clearable placeholder="请输入USD" >
+                        </el-input>
+                    </template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column
+                prop="remarkss"
+                label="备注" width="150px">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.remarkss"
+                              size="mini" autocomplete="off"
+                              clearable placeholder="请输入备注" >
+                    </el-input>
+                </template>
+            </el-table-column>
+
+
+        </el-table>
+    </div>
+</template>
+
+<script>
+    export default {
+        props:{
+            tableData:{
+                type:Array,
+                default:[]
+            }
+        },
+        data(){
+            return {
+
+            }
+        },
+        methods:{
+            // 多选选择的数据
+            handleSelectionChange(arr){
+                console.log(arr,220)
+            },
+            // 表头样式
+            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
+                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
+            },
+        }
+
+    }
+</script>
+
+<style scoped>
+.textHide {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+</style>

src/views/iosBasicData/finstlbills/index.vue

@@ -36,12 +36,21 @@
                              plain
                              @click="handleDelete">删 除
                   </el-button>
-
+              </template>
+              <template slot="menu" slot-scope="{row}">
+                  <el-button type="text"
+                             size="small"
+                             @click="editFun(row)">编辑
+                  </el-button>
+                  <el-button type="text"
+                             size="small"
+                             @click="rowDel(row)">删除
+                  </el-button>
               </template>
           </avue-crud>
       </basic-container>
 
-      <finstlbillsDetails v-if="!isShow" :editSave="editSave" @goBack="goBack"></finstlbillsDetails>
+      <finstlbillsDetails ref="finstlbillsDetails" v-if="!isShow" :editSave="editSave" @goBack="goBack"></finstlbillsDetails>
 
   </div>
 </template>
@@ -359,7 +368,16 @@
       newbillFun(){
           this.isShow = false
           this.editSave = false
+          // this.$refs.finstlbillsDetails
       },
+        // 编辑
+        editFun(row) {
+            this.isShow = false
+            this.editSave = true
+            this.$nextTick(()=>{
+                this.$refs.finstlbillsDetails.finstlbillsDetailfun(row.id)
+            })
+        },
       // 详情的返回列表
       goBack() {
           // 初始化数据