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

src/api/system/dept.js

@@ -9,6 +9,15 @@ export function listDept(query) {
   })
 }
 
+// 查询当前登陆人的所属部门列表
+export function myListDept(query) {
+  return request({
+    url: '/system/dept/myListDept',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({

src/views/ecw/customer/query.vue

@@ -113,27 +113,27 @@
         <el-card style="margin-top: 15px;">
           <h3>{{$t('银行账户')}}</h3>
           <el-table :data="customer.customerBankBackVOList" border>
-            <el-table-column label="编号" type="index"></el-table-column>
-            <el-table-column label="账户名称" prop="accountName"></el-table-column>
-            <el-table-column label="币别">
+            <el-table-column :label="$t('编号')" type="index"></el-table-column>
+            <el-table-column :label="$t('账户名称')" prop="accountName"></el-table-column>
+            <el-table-column :label="$t('币别')">
               <template v-slot="{row}">
                {{$l(currecyList.find(i => row.currency == i.id),'title')}}
               </template>
             </el-table-column>
-            <el-table-column label="银行名称" prop="bankName"></el-table-column>
-            <el-table-column label="银行账户" prop="bankAccount"></el-table-column>
-            <el-table-column label="银行代码" prop="bankCode"></el-table-column>
-            <el-table-column label="账户类型">
+            <el-table-column :label="$t('银行名称')" prop="bankName"></el-table-column>
+            <el-table-column :label="$t('银行账户')" prop="bankAccount"></el-table-column>
+            <el-table-column :label="$t('银行代码')" prop="bankCode"></el-table-column>
+            <el-table-column :label="$t('账户类型')">
               <template v-slot="{row}">
                 {{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
               </template>
             </el-table-column>
-            <el-table-column label="状态">
+            <el-table-column :label="$t('状态')">
             <template v-slot="{row}">
-              {{row.status ? '正常' :'停用'}}
+              {{row.status ? $t('正常') : $t('停用')}}
             </template>
             </el-table-column>
-            <el-table-column label="银行地址" prop="bankAddress"></el-table-column>
+            <el-table-column :label="$t('银行地址')" prop="bankAddress"></el-table-column>
           </el-table>
         </el-card>
 

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -27,14 +27,14 @@
     </el-form>
 
     <!-- 操作工具栏 -->
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
-<!--                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
@@ -149,7 +149,7 @@
         getPersonTargetPage,
         getMyDeptTargetPage
     } from "@/api/ecw/deptTarget";
-    import {listDept, listSimpleDepts} from "@/api/system/dept";
+    import {myListDept, listSimpleDepts} from "@/api/system/dept";
     import {getChannelList} from '@/api/ecw/channel';
     import dayjs from "dayjs";
 import { parseTime } from '@/utils/ruoyi';
@@ -271,7 +271,7 @@ import { parseTime } from '@/utils/ruoyi';
           /** 查询部门列表 */
           getDeptList(){
             this.loading = true;
-            listDept(this.queryParams).then(response => {
+            myListDept(this.queryParams).then(response => {
               this.deptList = this.handleTree(response.data, "id");
               console.log("this.deptList:"+JSON.stringify(this.deptList));
               this.deptList.forEach((item) => {

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

@@ -55,6 +55,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
+                  @click.native="selectFn('departmentName', item.name)"
                 />
               </el-select>
             </el-form-item>
@@ -68,12 +69,13 @@
               :rules="{required:true,message:$t('业务员不能为空')}"
               :error="$t('业务员不能为空')"
             >
-              <el-select filterable  v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
+              <el-select filterable  v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
                 <el-option
+                  @click.native="selectFn('salesmanName', item.nickname)"
                   v-for="item in creatorData"
                   :key="item.id"
                   :label="item.nickname"
-                  :value="item.nickname"
+                  :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -595,6 +597,10 @@ export default {
     },
   },
   methods: {
+    selectFn(keyVal, name){
+      this.form[keyVal] = name;
+      console.log(this.form,'form:')
+    },
     getCurrencyLabel(id) {
       var label = this.currencyList.filter(item => item.id == id)
       if (label.length > 0) return this.$i18n.locale == 'zh_CN' ? label[0].titleZh : label[0].titleEn

src/views/ecw/financial/creatCollection.vue

@@ -926,14 +926,14 @@ export default {
       this.rateChange(row, index)
     },
     writeOffRateChange(row, index) {
-      row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal))
+      row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal)).toFixed(2)
 
       const writeOffAmountTotal = this.form.receiptAccountList.filter(v => v.type !== 'total').reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
       this.form.receiptAccountList[this.form.receiptAccountList.length -1].writeOffAmount = writeOffAmountTotal
     },
     rateChange(row, index) {
       console.log(row)
-      row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(6))
+      row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(2))
       this.form.receiptAccountList[index] = {...row}
 
       setTimeout(() => {
@@ -942,7 +942,7 @@ export default {
         this.currencyList.forEach((item,index)=>{
           var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
           if(dollarList.length>0){
-            var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
+            var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(2)
             amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
           }
         })
@@ -1081,7 +1081,7 @@ export default {
         const totalt = this.form.receiptAccountList.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
         this.form.receiptAccountList = [...this.form.receiptAccountList, {
           type: 'total',
-          writeOffAmount: totalt,
+          writeOffAmount: totalt.toFixed(2),
           collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
         }]
 
@@ -1125,7 +1125,7 @@ export default {
       const index = this.form.receiptAccountList.findIndex(v => v.currencyId == type)
       const t = this.form.receiptAccountList[index]
       if (t) {
-        t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount)
+        t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount).toFixed(2)
         this.rateChange(t, index)
       }
     },