货代付费 2023-12-27

src/api/iosBasicData/bcorps.js

@@ -82,3 +82,15 @@ export const bcorpsbankList = (current,size,params) => {
     }
   })
 }
+// 通过往来单位id 获取发票抬头数据
+export const corpsinvoiceheaderList = (current,size,params) => {
+  return request({
+    url: '/api/blade-los/corpsinvoiceheader/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/components/trade-card/main.vue

@@ -7,7 +7,7 @@
       </div>
       <div v-if="showBtn" class="container-foot" @click="open">
         <div v-show="show" style="height: 20px">
-          <span><i class="el-icon-arrow-up" /></span>
+          <span><i class="el-icon-arrow-up" :style="styleIocup" /></span>
         </div>
         <div v-show="!show" style="height: 20px">
           <span><i class="el-icon-arrow-down" /></span>
@@ -58,6 +58,10 @@ export default {
       type: Boolean,
       default: true
     },
+    styleIocup:{
+      type:String,
+      default:''
+    },
   },
   methods: {
     open(){

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

@@ -37,12 +37,8 @@
                 </template>
             </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>
+                prop="billNo"
+                label="原业务编号" width="120px">
             </el-table-column>
             <!--<el-table-column-->
             <!--    prop="tableSelect"-->

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -573,30 +573,17 @@
                     this.form.businessType = 'FFSQ' // 结算单
                     this.form.dc = 'C' // 付
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                    if (!this.form.id) {
-                        this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                            item.lineNo = Number(index) + 1
-                            item.pType = item.businessType
-                            item.accBillId = item.id
-                            item.accBillNo = item.billNo
-                            item.accDate = item.billDate
-                            item.dc = item.accountDc // 收付
-                            if (item.currentStlCurCode == 'CNY') {
-                                item.currentStlAmount = item.currentStlAmountRMB
-                            }else {
-                                item.currentStlAmount = item.currentStlAmountUSD
-                            }
-                            delete item.businessType
-                            if (!this.form.id) {
-                                delete item.id
-                            }
-                            delete item.billNo
-                            delete item.billDate
-                            delete item.accountDc
-                            return item
-                        })
-                    }
-
+                    this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
+                        if (item.currentStlCurCode == 'CNY') {
+                            item.currentStlAmount = item.currentStlAmountRMB
+                        }else {
+                            item.currentStlAmount = item.currentStlAmountUSD
+                        }
+                        delete item.businessType
+                        delete item.billDate
+                        delete item.accountDc
+                        return item
+                    })
                     finstlbillsSubmit(this.form).then(res=>{
                         this.saveLoading = false
                         this.$message.success('操作成功');
@@ -661,10 +648,9 @@
                 // let obj = JSON.parse(JSON.stringify(this.form))
                 let obj = {}
                 obj.type = '2'
-                obj.dc = 'C' // 付
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.curCode = this.form.curCode // 币别
-                // obj.dc = this.form.dc // 收付 D=收 C=付
+                obj.dc = this.form.dc // 收付 D=收 C=付
                 obj.accBillNo = this.form.accountNo // 账单编号  ACCT NO
                 obj.billNo = this.form.businessNo // 单据编号  JOB NO
                 obj.checkBillNo = this.form.checkNo // CHK NO
@@ -683,12 +669,17 @@
                 }
 
                 finstlbillslistAccBillV1(obj).then(res=>{
-                    let arr = res.data.data.map(item=>{
+                    let arr = res.data.data.map((item,index)=>{
+                        item.accBillId = item.id
                         delete item.id
                         // 账单编号
                         item.accBillNo = item.billNo
-                        item.dc = item.accountDc // 收付
                         item.currentStlCurCode = item.curCode // 币别
+                        item.lineNo = Number(index) + 1
+                        item.pType = item.businessType
+                        item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
+                        item.accDate = item.billDate
+                        item.dc = item.accountDc // 收付
                         if(item.curCode == 'CNY') {
                             // 发票
                             this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -18,99 +18,26 @@
             </el-table-column>
             <el-table-column
                 prop="lineNo"
-                label="行号">
+                label="行号" width="50px">
             </el-table-column>
             <el-table-column
-                prop="businessType"
-                label="业务类型">
-            </el-table-column>
-            <el-table-column
-                prop="billType"
-                label="单据类型">
-            </el-table-column>
-            <el-table-column
-                prop="billNo"
-                label="单据编号">
+                prop="mblno"
+                label="MB/L NO">
                 <template slot-scope="{row}">
                     <span class="textHide">{{row.mblno}}</span>
                 </template>
             </el-table-column>
+            <!--<el-table-column-->
+            <!--    prop="description"-->
+            <!--    label="收费内容">-->
+            <!--</el-table-column>-->
             <el-table-column
-                prop="description"
-                label="收费内容">
-            </el-table-column>
-            <el-table-column
-                prop="descriptionMerge"
-                label="合并收费内容" width="120px">
-            </el-table-column>
-            <el-table-column
-                prop="isChequeSigned"
-                label="支票是否签收" width="120px">
-            </el-table-column>
-            <el-table-column
-                prop="isInvoiceSigned"
-                label="发票是否签收" width="120px">
-            </el-table-column>
-            <el-table-column
-                prop="amount"
-                label="账单金额">
-            </el-table-column>
-            <el-table-column
-                prop="currentCurCode"
-                label="本次发票币种" width="120px">
-                <template slot-scope="{row}">
-                    <search-query :datalist="curCodeData"
-                                  :selectValue="row.currentCurCode"
-                                  :filterable="true"
-                                  :clearable="true"
-                                  :remote="true"
-                                  :buttonIf="false"
-                                  :forParameter="{key:'id',label:'code',value:'code'}"
-                                  @remoteMethod="getRateListfun"
-                                  @corpChange="corpChange($event,row)"
-                                  @corpFocus="getRateListfun">
-                    </search-query>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="currentExrate"
-                label="本次发票汇率" width="100px">
-            </el-table-column>
-            <el-table-column
-                prop="currentTaxRate"
-                label="本次发票税率" width="100px">
-                <template slot-scope="{row}">
-                    <el-input style="width: 100%;" v-model="row.currentTaxRate"
-                              size="mini" autocomplete="off"
-                              clearable placeholder="请输入本次发票税率" @input="currentInput" >
-                    </el-input>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="currentSurRate"
-                label="本次发票附加税率" width="120px">
-                <template slot-scope="{row}">
-                    <el-input style="width: 100%;" v-model="row.currentSurRate"
-                              size="mini" autocomplete="off"
-                              clearable placeholder="请输入本次发票附加税率" @input="currentInput(row)" >
-                    </el-input>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="currentAmountTax"
-                label="税额">
-            </el-table-column>
-            <el-table-column
-                prop="currentAmountNet"
-                label="去税金额">
-            </el-table-column>
-            <el-table-column
-                prop="uninvoicedAmount"
-                label="已开发票金额" width="120px">
+                prop="feeCnName"
+                label="费用名称">
             </el-table-column>
             <el-table-column
                 prop="currentAmount"
-                label="本次发票金额" width="120px">
+                label="本次发票金额USD" width="120px">
                 <template slot-scope="{row}">
                     <el-input style="width: 100%;" v-model="row.currentAmount"
                               size="mini" autocomplete="off" @input=""
@@ -120,12 +47,70 @@
             </el-table-column>
             <el-table-column
                 prop="currentAmountLoc"
-                label="本次发票本币金额" width="120px">
+                label="本次发票金额CNY" width="120px">
             </el-table-column>
+
+
             <el-table-column
-                prop="billDate"
-                label="开票日期" width="140px">
+                prop="billNo"
+                label="JOB NO">
+                <template slot-scope="{row}">
+                    <span class="textHide">{{row.billNo}}</span>
+                </template>
             </el-table-column>
+            <!--<el-table-column-->
+            <!--    prop="amount"-->
+            <!--    label="账单金额">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentCurCode"-->
+            <!--    label="本次发票币种" width="120px">-->
+            <!--    <template slot-scope="{row}">-->
+            <!--        <search-query :datalist="curCodeData"-->
+            <!--                      :selectValue="row.currentCurCode"-->
+            <!--                      :filterable="true"-->
+            <!--                      :clearable="true"-->
+            <!--                      :remote="true"-->
+            <!--                      :buttonIf="false"-->
+            <!--                      :forParameter="{key:'id',label:'code',value:'code'}"-->
+            <!--                      @remoteMethod="getRateListfun"-->
+            <!--                      @corpChange="corpChange($event,row)"-->
+            <!--                      @corpFocus="getRateListfun">-->
+            <!--        </search-query>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentExrate"-->
+            <!--    label="本次发票汇率" width="100px">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentTaxRate"-->
+            <!--    label="本次发票税率" width="100px">-->
+            <!--    <template slot-scope="{row}">-->
+            <!--        <el-input style="width: 100%;" v-model="row.currentTaxRate"-->
+            <!--                  size="mini" autocomplete="off"-->
+            <!--                  clearable placeholder="请输入本次发票税率" @input="currentInput" >-->
+            <!--        </el-input>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentSurRate"-->
+            <!--    label="本次发票附加税率" width="120px">-->
+            <!--    <template slot-scope="{row}">-->
+            <!--        <el-input style="width: 100%;" v-model="row.currentSurRate"-->
+            <!--                  size="mini" autocomplete="off"-->
+            <!--                  clearable placeholder="请输入本次发票附加税率" @input="currentInput(row)" >-->
+            <!--        </el-input>-->
+            <!--    </template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentAmountTax"-->
+            <!--    label="税额">-->
+            <!--</el-table-column>-->
+            <!--<el-table-column-->
+            <!--    prop="currentAmountNet"-->
+            <!--    label="去税金额">-->
+            <!--</el-table-column>-->
             <el-table-column
                 prop="corpCnName"
                 label="客户中文名称" width="140px">
@@ -133,52 +118,17 @@
                     <span class="textHide">{{row.corpCnName}}</span>
                 </template>
             </el-table-column>
-            <el-table-column
-                prop="corpEnName"
-                label="客户英文名称" width="140px">
-                <template slot-scope="{row}">
-                    <span class="textHide">{{row.corpEnName}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="mblno"
-                label="MB/L NO">
-                <template slot-scope="{row}">
-                    <span class="textHide">{{row.mblno}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="hblno"
-                label="HB/L NO">
-            </el-table-column>
-            <el-table-column
-                prop="feeCnName"
-                label="费用名称">
-            </el-table-column>
-            <el-table-column
-                prop="paymode"
-                label="付款方式">
-            </el-table-column>
+
             <el-table-column
                 prop="accBillNo"
                 label="账单编号">
                 <template slot-scope="{row}">
-                    <span class="textHide">{{row.mblno}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                prop="accDate"
-                label="账单日期">
-                <template slot-scope="{row}">
-                    <span class="textHide">{{row.mblno}}</span>
+                    <span class="textHide">{{row.accBillNo}}</span>
                 </template>
             </el-table-column>
+
             <el-table-column
-                prop="dc"
-                label="费用收付">
-            </el-table-column>
-            <el-table-column
-                prop="lineNo"
+                prop="remarks"
                 label="备注">
             </el-table-column>
             <el-table-column