货代 2024-1-13

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -1068,7 +1068,7 @@ export default {
                 obj.corpId = this.form.corpId // 结算单位
                 obj.checkNo = this.form.checkNo // CHK NO 对账单号
                 finstlbillsGetByDetail(obj).then(res=>{
-                    let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                    let arr = res.data.data.finStlBillsItemsList.map((item,index)=>{
                         item.lineNo = Number(index) + 1 // 行号
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1068,7 +1068,7 @@ export default {
                 obj.corpId = this.form.corpId // 结算单位
                 obj.checkNo = this.form.checkNo // CHK NO 对账单号
                 finstlbillsGetByDetail(obj).then(res=>{
-                    let arr = res.data.data.finStlBillsItemsList.map((item)=>{
+                    let arr = res.data.data.finStlBillsItemsList.map((item,index)=>{
                         item.lineNo = Number(index) + 1 // 行号
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate

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

@@ -71,12 +71,28 @@
                 </template>
             </el-table-column>
             <el-table-column
-                prop="amountRMB"
-                label="本次CNY">
+                prop="currentStlAmountRMB"
+                label="本次对账CNY" width="100">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"
+                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'CNY'"
+                              clearable placeholder="请输入USD" >
+                    </el-input>
+                    <span v-else>{{scope.row.currentStlAmountRMB}}</span>
+                    <!--<span>{{scope.row.currentStlAmountRMB}}</span>-->
+                </template>
             </el-table-column>
             <el-table-column
-                prop="amountUSD"
-                label="本次USD">
+                prop="currentStlAmountUSD"
+                label="本次对账USD" width="100">
+                <template slot-scope="scope">
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"
+                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'USD'"
+                              clearable placeholder="请输入USD" >
+                    </el-input>
+                    <span v-else>{{scope.row.currentStlAmountUSD}}</span>
+                    <!--<span>{{scope.row.currentStlAmountUSD}}</span>-->
+                </template>
             </el-table-column>
             <el-table-column
                 label="币种"
@@ -99,32 +115,25 @@
                 </template>
             </el-table-column>
             <el-table-column
-                prop="currentStlAmountRMB"
-                label="本次对账CNY" width="100">
-                <template slot-scope="scope">
-                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"
-                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'CNY'"
-                              clearable placeholder="请输入USD" >
-                    </el-input>
-                    <span v-else>{{scope.row.currentStlAmountRMB}}</span>
-                    <!--<span>{{scope.row.currentStlAmountRMB}}</span>-->
-                </template>
+                prop="currentStlExrate"
+                label="汇率">
             </el-table-column>
+
             <el-table-column
-                prop="currentStlAmountUSD"
-                label="本次对账USD" width="100">
-                <template slot-scope="scope">
-                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"
-                              size="mini" autocomplete="off" :disabled="scope.row.currentStlCurCode != 'USD'"
-                              clearable placeholder="请输入USD" >
-                    </el-input>
-                    <span v-else>{{scope.row.currentStlAmountUSD}}</span>
-                    <!--<span>{{scope.row.currentStlAmountUSD}}</span>-->
+                prop="stlAmountDr"
+                label="已结算CNY" width="100px">
+                <template slot-scope="{ row }">
+                    <span v-if="row.dc == 'D'">{{row.stlAmountDr}}</span>
+                    <span v-if="row.dc == 'C'">{{row.stlAmountCr}}</span>
                 </template>
             </el-table-column>
             <el-table-column
-                prop="currentStlExrate"
-                label="汇率">
+                prop="stlAmountDrUSD"
+                label="已结算USD" width="100px">
+                <template slot-scope="{ row }">
+                    <span v-if="row.dc == 'D'">{{row.stlAmountDrUSD}}</span>
+                    <span v-if="row.dc == 'C'">{{row.stlAmountCrUSD}}</span>
+                </template>
             </el-table-column>
             <!--<el-table-column-->
             <!--    prop="tableSelect"-->
@@ -256,19 +265,19 @@
             </el-table-column>
             <el-table-column
                 prop="unsettledAmountRMB"
-                label="应对账CNY">
+                label="应对账CNY" width="100px">
             </el-table-column>
             <el-table-column
                 prop="unsettledAmountUSD"
-                label="应对账USD">
+                label="应对账USD" width="100px">
             </el-table-column>
             <el-table-column
                 prop="stlTtlAmountRMB"
-                label="已对账CNY">
+                label="已对账CNY" width="100px">
             </el-table-column>
             <el-table-column
                 prop="stlTtlAmountUSD"
-                label="已对账USD">
+                label="已对账USD" width="100px">
             </el-table-column>
             <!--<el-table-column-->
             <!--    prop="voyageNo"-->