feat✨: 修复输入框前后去除空格问题，创建收款单基准币种去除空格和批量导入银行收款信息取消二次上传失效

src/views/ecw/financial/commission-Payment.vue

@@ -8,12 +8,26 @@
         <el-row :gutter="30">
           <el-col :span="7">
             <el-form-item :label="$t('付款单号')">
-              <el-input :placeholder="$t('请输入付款单号')" v-model="queryParams.paymentNo"></el-input>
+              <el-input
+                :placeholder="$t('请输入付款单号')"
+                v-model.trim="queryParams.paymentNo"
+                @keyup.enter.native="
+                  queryParams.page = 1
+                  getList()
+                "
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('客户')">
-              <el-input :placeholder="$t('请输入客户')" v-model="queryParams.searchKey"></el-input>
+              <el-input
+                :placeholder="$t('请输入客户')"
+                v-model.trim="queryParams.searchKey"
+                @keyup.enter.native="
+                  queryParams.page = 1
+                  getList()
+                "
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -45,7 +59,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('账单号')">
-              <el-input :placeholder="$t('请输入账单号')" v-model="queryParams.accountNumber"></el-input>
+              <el-input
+                :placeholder="$t('请输入账单号')"
+                v-model.trim="queryParams.accountNumber"
+                @keyup.enter.native="
+                  queryParams.page = 1
+                  getList()
+                "
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">

src/views/ecw/financial/commission-payable.vue

@@ -8,12 +8,26 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item :label="$t('订单号')">
-              <el-input :placeholder="$t('请输入订单号')" v-model="queryParams.orderNo"></el-input>
+              <el-input
+                :placeholder="$t('请输入订单号')"
+                v-model.trim="queryParams.orderNo"
+                @keyup.enter.native="
+                  queryParams.page = 1
+                  getList()
+                "
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('客户')">
-              <el-input :placeholder="$t('请输入客户')" v-model="queryParams.customerName"></el-input>
+              <el-input
+                :placeholder="$t('请输入客户')"
+                v-model.trim="queryParams.customerName"
+                @keyup.enter.native="
+                  queryParams.page = 1
+                  getList()
+                "
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">

src/views/ecw/financial/creatCollection.vue

@@ -74,7 +74,7 @@
           </el-table-column>
           <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
             <template slot-scope="scope">
-              <span>{{ getCurrencySymbol(scope.row.currencyId) }} {{ scope.row.unitPrice }}</span>
+              <span>{{ getCurrencySymbol(scope.row.currencyId) }}{{ scope.row.unitPrice }}</span>
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
@@ -85,13 +85,13 @@
           </el-table-column>
           <el-table-column :label="$t('不含税金额')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ getCurrencySymbol(scope.row.currencyId) }} {{ scope.row.totalAmount }}</span>
+              <span>{{ getCurrencySymbol(scope.row.currencyId) }}{{ scope.row.totalAmount }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('含税金额')" align="center" prop="taxAmount" :formatter="formatCurrency"> </el-table-column>
           <el-table-column :label="$t('优惠金额')" align="center" prop="discountTotal">
             <template slot-scope="scope">
-              <span> {{ getCurrencySymbol(scope.row.currencyId) }} {{ scope.row.discountTotal ? `${scope.row.discountTotal}` : 0 }}</span>
+              <span> {{ getCurrencySymbol(scope.row.currencyId) }}{{ scope.row.discountTotal ? `${scope.row.discountTotal}` : 0 }}</span>
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
               <span v-if="scope.row.discountTotal">{{ scope.row.discountRemark ? "(" + scope.row.discountRemark + ")" : "" }}</span>
             </template>
@@ -103,7 +103,7 @@
           </el-table-column>
 
           <el-table-column prop="exchangeRate" :label="$t('基准币种（{currency}）汇率', { currency: getBaseCurrencynName(showCurrencyId) })" width="120">
-            <template v-slot="{ row }"> {{ getCurrencySymbol(row.currencyId) }} 1: {{ getCurrencySymbol(showCurrencyId) }}{{ row.exchangeRate }} </template>
+            <template v-slot="{ row }"> {{ getCurrencySymbol(row.currencyId) }}1:{{ getCurrencySymbol(showCurrencyId) }}{{ row.exchangeRate }} </template>
           </el-table-column>
           <el-table-column
             prop="baseAmount"
@@ -211,7 +211,7 @@
           </el-table-column>
           <el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
             <template slot-scope="scope">
-              <span v-if="scope.row.type !== 'total'">{{ getCurrencySymbol(scope.row.collectionCurrencyId) }} {{ scope.row.collectionAmount }}</span>
+              <span v-if="scope.row.type !== 'total'">{{ getCurrencySymbol(scope.row.collectionCurrencyId) }}{{ scope.row.collectionAmount }}</span>
               <div v-else>
                 <div v-for="itemAmount in scope.row.collectionAmount">
                   <!-- {{ itemAmount }}-- {{ $i18n.locale == "zh_CN" ? (itemAmount ? itemAmount.currencyNameZh : "") : itemAmount ? itemAmount.currencyNameEn : "" }}: -->

src/views/ecw/financial/payable.vue

@@ -6,10 +6,10 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="card">
         <el-row>
           <el-form-item :label="$t('柜号')">
-            <el-input style="max-width: 188px" v-model="queryParams.containerNo" :placeholder="$t('请输入柜号')" clearable @keyup.enter.native="handleQuery" />
+            <el-input style="max-width: 188px" v-model.trim="queryParams.containerNo" :placeholder="$t('请输入柜号')" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item :label="$t('自编号')">
-            <el-input style="max-width: 188px" v-model="queryParams.payableNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
+            <el-input style="max-width: 188px" v-model.trim="queryParams.payableNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item :label="$t('始发仓')">
             <el-select v-model="queryParams.departureIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
@@ -39,7 +39,7 @@
         </el-row>
         <el-row>
           <el-form-item :label="$t('供应商名称')">
-            <el-input style="max-width: 188px" v-model="queryParams.supplierName" :placeholder="$t('请输入供应商名称')" clearable @keyup.enter.native="handleQuery" />
+            <el-input style="max-width: 188px" v-model.trim="queryParams.supplierName" :placeholder="$t('请输入供应商名称')" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item :label="$t('费用类型')">
             <dict-selector :type="DICT_TYPE.FEE_TYPE" multiple v-model="queryParams.feeTypeList" clearable></dict-selector>

src/views/ecw/financial/paymentVoucher.vue

@@ -5,7 +5,7 @@
     <el-card v-show="showSearch" class="card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="card">
         <el-form-item :label="$t('付款单号')">
-          <el-input style="max-width: 188px" v-model="queryParams.paymentNo" :placeholder="$t('请输入付款单号')" clearable @keyup.enter.native="handleQuery"></el-input>
+          <el-input style="max-width: 188px" v-model.trim="queryParams.paymentNo" :placeholder="$t('请输入付款单号')" clearable @keyup.enter.native="handleQuery"></el-input>
         </el-form-item>
         <el-form-item :label="$t('供应商')">
           <el-select clearable v-model="queryParams.supplierIdList" multiple :placeholder="$t('请选择供应商')">
@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item :label="$t('业务员')">
           <el-select v-model="queryParams.salesmanNameList" multiple filterable :placeholder="$t('请选择业务员')" clearable>
-            <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.nickname" />
+            <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('创建时间')">

src/views/ecw/financial/receiptDetail.vue

@@ -114,7 +114,7 @@
           "
           width="120"
         >
-          <template v-slot="{ row }"> {{ getCurrencySymbol(row.currencyId) }} 1: {{ getCurrencySymbol(showCurrencyId) }}{{ row.exchangeRate }} </template>
+          <template v-slot="{ row }"> {{ getCurrencySymbol(row.currencyId) }}1:{{ getCurrencySymbol(showCurrencyId) }}{{ row.exchangeRate }} </template>
         </el-table-column>
         <el-table-column
           prop="baseAmount"

src/views/ecw/financial/receivable.vue

@@ -34,17 +34,17 @@
           <dict-selector class="custom-form-item" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypeList" clearable />
         </el-form-item>
         <el-form-item :label="$t('订单号')">
-          <el-input class="custom-form-item" v-model="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('品名')">
-          <el-input class="custom-form-item" v-model="queryParams.title" :placeholder="$t('请输入品名')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.title" :placeholder="$t('请输入品名')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
 
         <el-form-item :label="$t('提单号')">
-          <el-input class="custom-form-item" v-model="queryParams.tidanNo" :placeholder="$t('请输入提单号')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.tidanNo" :placeholder="$t('请输入提单号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('唛头')">
-          <el-input class="custom-form-item" v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('费用类型')">
           <dict-selector class="custom-form-item" :type="DICT_TYPE.FEE_TYPE" multiple v-model="queryParams.feeTypeList" clearable></dict-selector>
@@ -57,11 +57,11 @@
             />
           </el-form-item> -->
         <el-form-item label="发货人:">
-          <el-input class="custom-form-item" v-model="queryParams.consignorNameOrPhone" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.consignorNameOrPhone" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
 
         <el-form-item :label="$t('收货人')">
-          <el-input class="custom-form-item" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery" />
+          <el-input class="custom-form-item" v-model.trim="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery" />
           <!--           <customer-selector
               v-model="queryParams.consigneeNameOrPhone"
               @change="consignor = $event"

src/views/ecw/financial/voucher.vue

@@ -6,7 +6,7 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="card">
         <!-- <el-row :span="24"> -->
         <el-form-item :label="$t('收款单号')">
-          <el-input style="max-width: 188px" v-model="queryParams.receiptNo" :placeholder="$t('请输入收款单号')" clearable @keyup.enter.native="handleQuery" />
+          <el-input style="max-width: 188px" v-model.trim="queryParams.receiptNo" :placeholder="$t('请输入收款单号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')">
           <el-select multiple :remote-method="customerDropDownFn" remote clearable filterable v-model="queryParams.customerIdList" :placeholder="$t('请输入关键词')">
@@ -33,7 +33,7 @@
         </el-form-item>
         <!-- </el-row> -->
         <el-form-item :label="$t('编号')">
-          <el-input style="max-width: 188px" v-model="queryParams.numberNo" :placeholder="$t('订单号和提单号,自编号')" clearable @keyup.enter.native="handleQuery" />
+          <el-input style="max-width: 188px" v-model.trim="queryParams.numberNo" :placeholder="$t('订单号和提单号,自编号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <!-- <el-row :span="24"> -->
         <!-- <el-col style="width: 592px"> -->
@@ -228,7 +228,7 @@
     </el-dialog>
 
     <!-- 批量导入弹窗 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" @close="closeUploadDialog" append-to-body>
       <el-upload ref="upload" :multiple="false" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?ignoreItem=' + upload.ignoreItem" :data="upload.data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload" />
         <div class="el-upload__text">
@@ -400,6 +400,9 @@ export default {
     this.getList()
   },
   methods: {
+    closeUploadDialog() {
+      this.fileCopy = null
+    },
     customerDropDownFn(val) {
       customerDropDownList({ pageNo: 1, pageSize: 200, searchKey: val }).then((res) => {
         if (res.code === 0) {