Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customer/query.vue

@@ -19,7 +19,8 @@
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
-              <dict-tag v-if="customer.transportType" v-for="item in (customer.transportType || '').split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>
+              {{ getDictDatas2(DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE, (customer.transportType||'').split(',')).map(e => e.label).join(', ') }}
+<!--              <dict-tag v-if="customer.transportType" v-for="item in (customer.transportType || '').split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>-->
             </el-descriptions-item>
             <el-descriptions-item :label="$t('资源类型')">
               <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" :value="customer.resourceType"></dict-tag>

src/views/ecw/financial/creatCollection.vue

@@ -53,7 +53,7 @@
               :span="4"
               :rules="{ required: true, trigger: ['blur', 'change'], message: $t('业务员不能为空') }"
             >
-              <el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')" @change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname">
+              <el-select v-model="form.salesmanId" filterable :placeholder="$t('请选择业务员')" @change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname">
                 <el-option
                   v-for="item in creatorData"
                   :key="item.id"

src/views/ecw/financial/paymentVoucher.vue

@@ -58,7 +58,15 @@
         </el-row>
         <el-row :span="24">
           <el-form-item :label="$t('业务员')">
-            <el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
+<!--            <el-select v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
+              <el-option
+                v-for="item in creatorData"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select> -->
+            <el-select v-model="form.salesmanId" filterable :placeholder="$t('请选择业务员')" @change="v => form.salesmanName = creatorData.find(t => t.id === v).nickname">
               <el-option
                 v-for="item in creatorData"
                 :key="item.id"
@@ -189,7 +197,7 @@
 </template>
 
 <script>
-import { userList } from "@/api/system/user";
+import { userList,listSimpleUsers } from "@/api/system/user";
 import { DICT_TYPE } from "@/utils/dict";
 import CustomerSelector from "@/components/CustomerSelector";
 import { getSupplierPage } from "@/api/ecw/supplier";
@@ -242,7 +250,8 @@ export default {
   },
   created() {
     let that = this;
-    userList("salesman").then((res) => (that.creatorData = res.data));
+        listSimpleUsers().then((res) => (that.creatorData = res.data));
+    // userList("salesman").then((res) => (that.creatorData = res.data));
     getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
       const { data } = res;
       this.allSupplier = data.list;

src/views/ecw/financial/receiptDetail.vue

@@ -220,7 +220,12 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="rate" />
-        <el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />
+<!--        <el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />-->
+        <el-table-column align="center" prop="writeOffAmount" >
+          <template #header>
+            {{ $t('兑核销基准金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('实收日期')" align="center" prop="amountDate">
           <!-- <template slot-scope="scope">
             <span>{{ parseTime(scope.row.amountDate, '{y}-{m}-{d}') }}</span>
@@ -353,10 +358,10 @@
           <el-form-item
             v-if="showCurrencyId != addForm.currencyId"
             prop="rate"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: $t('汇率不能为空') }"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }"
           >
             <template slot="label">
-              {{ $t('汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <el-input  v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
             <span v-else>{{ addForm.rate}}</span>
@@ -365,7 +370,7 @@
             v-if="showCurrencyId != addForm.currencyId"
           >
             <template slot="label">
-              {{ $t('金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('兑核销基准币种金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <span>{{ addForm.writeOffAmount?parseFloat(addForm.writeOffAmount).toFixed(6):'' }}</span>
           </el-form-item>