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

src/views/ecw/financial/creatPayment.vue

@@ -197,7 +197,8 @@
         </el-table-column>
         <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" >
           <template slot-scope="scope">
-           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span>
+           <!-- <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span> -->
+           <span>{{scope.row.total}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -478,7 +479,7 @@ export default {
           applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}'),
           invoiceStatus: String(res.data.invoiceStatus),
         }
-
+        
         this.$set(this.form,'supplierBankAccount',res.data.supplierBankAccount)
         console.log(this.form)
       })
@@ -626,6 +627,9 @@ export default {
     },
     selectChangeBank(val){
       this.$forceUpdate()
+      var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
+      this.form.supplierBank = bank.bankName
+      this.form.supplierBankAccountName = bank.accountName
     },
     selectChange(val) {
       this.bankData = []

src/views/ecw/financial/paymentDetail.vue

@@ -162,7 +162,8 @@
         <el-table-column :label="$t('税率%')" align="center" prop="taxRate" />
         <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" >
           <template slot-scope="scope">
-           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span>
+           <!-- <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span> -->
+         <span>{{scope.row.total}}</span>
           </template>
         </el-table-column>
       </el-table>

src/views/ecw/financial/paymentExamine.vue

@@ -16,7 +16,7 @@
             {{ detail.applicationAt }}
           </el-descriptions-item>
           <el-descriptions-item :label="$t('供应商银行账号')" style="width: 50%">
-            {{ findBank(detail.supplierBankAccount) }}
+            {{ detail.supplierBankAccountName+'('+detail.supplierBankAccount+')' }} 
           </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="3" class="card" border>
@@ -116,7 +116,7 @@ export default {
   created() {
 	  getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     let that = this;
-	
+
     if (that.$route.query.id && that.$route.query.id !== '0') {
       this.id = this.$route.query.id;
       getPaymentInfoByIds({ id: this.id }).then(res => {
@@ -201,7 +201,7 @@ export default {
       var chineseStr = '';
       //分离金额后用的数组，预定义
       var parts;
-      // 传入的参数为空情况 
+      // 传入的参数为空情况
       if(money === '') {
         return '';
       }
@@ -209,7 +209,7 @@ export default {
       if(money >= maxNum){
         return ''
       }
-      // 传入的参数为0情况 
+      // 传入的参数为0情况
       if (money === 0) {
         chineseStr = cnNums[0] + cnIntLast + cnInteger;
         return chineseStr
@@ -244,7 +244,7 @@ export default {
             chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
           }
           if(m == 0 && zeroCount < 4){
-            chineseStr += cnIntUnits[q]; 
+            chineseStr += cnIntUnits[q];
           }
         }
         // 最后+ 元

src/views/ecw/financial/paymentVoucher.vue

@@ -133,17 +133,17 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" @click="handleAdd(scope.row.id)" type="text">{{ $t('编辑') }}</el-button>
-          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>
+          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini"  v-hasPermi="['ecw:verification:update']" @click="handleAdd(scope.row.id)" type="text">{{ $t('编辑') }}</el-button>
+          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" v-hasPermi="['ecw:verification:update']" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>
 
-          <el-button v-if="scope.row.state == 2" size="mini" type="text" @click="verifyCancelClick(scope.row)">{{ $t('反审核') }}</el-button>
-          <el-button v-if="scope.row.state == 2" size="mini" type="text" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
+          <el-button v-if="scope.row.state == 2" size="mini" type="text" v-hasPermi="['ecw:verification:update']" @click="verifyCancelClick(scope.row)">{{ $t('反审核') }}</el-button>
+          <el-button v-if="scope.row.state == 2" size="mini" type="text" v-hasPermi="['ecw:verification:update']" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
 
-          <el-button v-if="scope.row.state == 4" size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
+          <el-button v-if="scope.row.state == 4" size="mini" type="text" v-hasPermi="['ecw:verification:update']" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
           <!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">开票</el-button> -->
 
-          <el-button size="mini" type="text" @click="toprint(scope.row.id)">{{ $t('打印') }}</el-button>
-          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
+          <el-button size="mini" type="text" @click="toprint(scope.row.id)" v-hasPermi="['ecw:verification:query']">{{ $t('打印') }}</el-button>
+          <el-button v-if="scope.row.state == 1 || scope.row.state == 3" size="mini" type="text" v-hasPermi="['ecw:verification:delete']" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
           <!-- <el-button size="mini" type="text" @click="open = true">导出订单</el-button> -->
         </template>
       </el-table-column>

src/views/ecw/financial/printPaymentVoucher.vue

@@ -33,13 +33,14 @@
       <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 ">
           <tr>
             <th style="width: 6%;">{{ $t('序号') }}</th>
-            <th style="width: 15%;">{{ $t('自编号') }}</th>
+            <th style="width: 11%;">{{ $t('自编号') }}</th>
             <th style="width: 15%;">{{ $t('费用类型') }}</th>
-            <th style="width: 15%;">{{ $t('币种') }}</th>
+            <th style="width: 10%;">{{ $t('币种') }}</th>
             <th style="width: 10%;">{{ $t('汇率') }}</th>
+             <th style="width:10%;">{{ $t('税率') }}</th>
             <th style="width: 15%;">{{ $t('发票号') }}</th>
-            <th style="width: 12%;">{{ $t('应付金额') }}</th>
-            <th style="width: 12%;">{{ $t('申请金额') }}</th>
+            <th style="width: 10%;">{{ $t('应付金额') }}</th>
+            <th style="width: 10%;">{{ $t('申请金额') }}</th>
           </tr>
           <tr v-for="(item, index) in list" :key="index">
             <td>{{ index + 1 }}</td>
@@ -54,6 +55,7 @@
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="item.currencyId" /> -->
             </td>
             <td>{{ item.exchangeRate }}</td>
+            <td>{{ item.taxRate }}</td>
             <td>{{ item.invoiceNumber }}</td>
             <td>{{ item.totalAmount }}</td>
             <td>{{ item.total }}</td>
@@ -190,7 +192,7 @@
       },
       totalMoney() {
         const t = this.list.map(v => v.total).reduce((prev, curr) => {
-          return prev + curr;
+          return parseFloat(prev) + parseFloat(curr);
         }, 0)
         return t
       },

src/views/ecw/financial/voucher.vue

@@ -184,6 +184,7 @@
             size="mini"
             type="text"
             @click="verificationCancelClick(scope.row)"
+            v-hasPermi="['ecw:verification:update']"
             >{{ $t('反核销') }}</el-button
           >
           <el-button