费用净额计算与拉下选项显示问题处理

src/components/iosbasic-data/searchquery.vue

@@ -12,7 +12,8 @@
                         :disabled="item[forParameter.disabled] ? item[forParameter.disabled] == disabledStatus : false">
                         <span v-if="!joinData" style="float: left">{{ item[forParameter.label] }}</span>
                         <span v-if="joinData" style="float: left">
-                           <span>{{ item[forParameter.label] }} - {{  item[forParameter.short] }}</span>
+                           <span v-if="!special">{{ item[forParameter.label] }} - {{  item[forParameter.short] }}</span>
+                           <span v-if="special">{{ item[forParameter.short] }} - {{  item[forParameter.label] }}</span>
                         </span>
                         <span v-if="desc" style="float: right; color: #8492a6; font-size: 13px">{{
                             item[forParameter.desc]}}</span>
@@ -162,6 +163,10 @@ export default {
             type: Number,
             default: 1
         },
+        special: {
+            type: Boolean,
+            default: false
+        }
     },
     watch: {
         // // 监听
@@ -192,6 +197,7 @@ export default {
         // 下拉change
         corpChange(value) {
             this.$emit('corpChange', value)
+            this.selectValue = value
         },
         /* 远程模糊查询操作用户 */
         remoteMethod(name) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -144,9 +144,9 @@
                                 <el-col :span="10">
                                     <search-query :datalist="placeReceiptData"
                                         :selectValue="assemblyForm.placeReceiptName" :filterable="true"
-                                        :clearable="true" :remote="true" :joinData="true"
+                                        :clearable="true" :remote="true" :joinData="true" :special="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择收货地"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'placeReceipt')"
                                         @corpChange="corpChange($event, 'placeReceipt')"
                                         @corpFocus="remoteMethod($event, 'placeReceipt')">
@@ -175,10 +175,10 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
-                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true" :special="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                         placeholder="请选择装货港"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'pol')"
                                         @corpChange="corpChange($event, 'pol')"
                                         @corpFocus="remoteMethod($event, 'pol')">
@@ -207,9 +207,10 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
-                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
+                                                  ref="testSearch"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true" :special="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择卸货港"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'pod')"
                                         @corpChange="corpChange($event, 'pod')"
                                         @corpFocus="remoteMethod($event, 'pod')">
@@ -238,10 +239,10 @@
                                 <el-col :span="10">
                                     <search-query :datalist="destinationData"
                                         :selectValue="assemblyForm.destinationName" :filterable="true" :clearable="true"
-                                        :remote="true" :joinData="true"
+                                        :remote="true" :joinData="true" :special="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                         placeholder="请选择目的地"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'destination')"
                                         @corpChange="corpChange($event, 'destination')"
                                         @corpFocus="remoteMethod($event, 'destination')">
@@ -270,10 +271,10 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="placeDeliveryData" :joinData="true"
-                                        :selectValue="assemblyForm.placeDeliveryName" :filterable="true"
+                                        :selectValue="assemblyForm.placeDeliveryName" :filterable="true" :special="true"
                                         :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                         :buttonIf="false" placeholder="请选择交货地"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'placeDelivery')"
                                         @corpChange="corpChange($event, 'placeDelivery')"
                                         @corpFocus="remoteMethod($event, 'placeDelivery')">
@@ -302,9 +303,9 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
-                                        :filterable="true" :clearable="true" :remote="true" :joinData="true"
+                                        :filterable="true" :clearable="true" :remote="true" :joinData="true" :special="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
-                                        :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
+                                        :forParameter="{ key: 'id', short: 'code', label: 'enName', value: 'enName' }"
                                         @remoteMethod="remoteMethod($event, 'pot')"
                                         @corpChange="corpChange($event, 'pot')"
                                         @corpFocus="remoteMethod($event, 'pot')">
@@ -1300,12 +1301,13 @@ export default {
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
-                        console.log(item)
+                        console.log(item, '--------------------------------')
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
                         this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        console.log('***********************', this.$refs.testSearch)
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polEnName)

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -194,6 +194,14 @@
                     <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
                     <span v-else>{{ row.remarks }}</span>
                 </template>
+                <template slot="usdAmountNet" slot-scope="{ row }">
+                    <span v-if="row.isTax">{{taxAmount(row, 2)}}</span>
+                    <span v-else>{{ row.usdAmount }}</span>
+                </template>
+                <template slot="rmbAmountNet" slot-scope="{ row }">
+                    <span v-if="row.isTax">{{taxAmount(row, 1)}}</span>
+                    <span v-else>{{ row.rmbAmount }}</span>
+                </template>
                 <template slot-scope="scope" slot="menu">
                     <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
                     <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
@@ -1524,6 +1532,16 @@ export default {
         this.paymodeWorkDictsfun() // 获取预付/到付数据
     },
     methods: {
+        taxAmount (row, type) {
+            let nowTaxRate = Number(row.taxRate)
+            let nowSurchargeRate = Number(row.surchargeRate)
+            console.info(nowTaxRate, nowSurchargeRate)
+            if (nowTaxRate < 1 || nowSurchargeRate < 1) {
+                // 输入的小数税率
+                return  type === 1 ? row.rmbAmount ?  row.rmbAmount * (1 + nowTaxRate + nowSurchargeRate) : row.rmbAmount : row.usdAmount ? row.usdAmount * (1 + nowTaxRate + nowSurchargeRate) : row.usdAmount
+            }
+            return type === 1 ? row.rmbAmount ? row.rmbAmount * (100 + nowTaxRate + nowSurchargeRate)/100 : row.rmbAmount : row.usdAmount ? row.usdAmount * (100 + nowTaxRate + nowSurchargeRate) /100  : row.usdAmount
+        },
         getSum() {
             let sumArr = []
             let corpArr = []