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

src/api/ecw/box.js

@@ -154,7 +154,6 @@ export function cancelBillService(id) {
 export function downloadBillService(params) {
   return request({
     url: "/shipment/make-bill-of-lading/download",
-    responseType: "blob",
     method: "get",
     params,
   });

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="sea">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/indexSeaAir.vue

@@ -111,7 +111,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="seaAir">{{$t('操作')}}-{{$t('海空联运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/ladingBill/previewBill.vue

@@ -10,7 +10,8 @@
 
 <script>
 import lodop from "@/utils/lodop";
-import { downloadFile } from "../shippingSea/utils";
+import * as _BOX from "@/api/ecw/box";
+import FileSaver from "file-saver";
 
 export default {
   name: "previewBill",
@@ -21,12 +22,11 @@ export default {
   },
   methods: {
     download() {
-      downloadFile(
-        "downloadBillService",
-        { id: this.currRow.id },
-        this.currRow.orderNo + ".pdf",
-        "pdf"
-      );
+      _BOX["downloadBillService"]({ id: this.currRow.id }).then((res) => {
+        if (res.data && res.data.imgUrl) {
+          FileSaver.saveAs(res.data.imgUrl, this.currRow.orderNo + ".pdf");
+        }
+      });
     },
     print() {
       lodop()

src/views/ecw/financial/creatPayment.vue

@@ -190,7 +190,7 @@
             <el-input v-model="scope.row.exchangeRate"></el-input>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('税率%')" align="center" prop="taxRate" >
+        <el-table-column :label="$t('税率')+'%'" align="center" prop="taxRate" >
           <template slot-scope="scope">
             <el-input v-model="scope.row.taxRate" @keyup.native="scope.row.taxRate = oninput(scope.row.taxRate)"></el-input>
           </template>
@@ -218,7 +218,7 @@
               style="margin-bottom: 0"
               prop="accountNumber"
               :rules="[
-                { required: true, message: '账单号不能为空', trigger: 'blur' },
+                { required: true, message:$t('账单号不能为空'), trigger: 'blur' },
               ]"
             >
               <el-input
@@ -250,7 +250,7 @@
     </el-card>
     <div slot="footer" style="margin: 20px 0">
       <!-- <el-button type="primary" @click="submitDraft">保 存</el-button> -->
-      <el-button type="primary" @click="submitForm">{{id==0?'新 增':'编 辑'}}</el-button>
+      <el-button type="primary" @click="submitForm">{{id==0?$t('新增'):$t('编辑')}}</el-button>
     </div>
     <el-dialog
       :visible.sync="open"

src/views/ecw/financial/openInvoice.vue

@@ -28,7 +28,7 @@
           <el-descriptions-item :label="$t('纳税人识别号')">{{ invoiceData.taxpayer }}</el-descriptions-item>
           <el-descriptions-item :label="$t('地址')">{{ invoiceData.addressPhone }}</el-descriptions-item>
           <el-descriptions-item :label="$t('开户行')">{{ invoiceData.accountBank }}</el-descriptions-item>
-          <el-descriptions-item :label="$t('税率%')">
+          <el-descriptions-item :label="$t('税率')+'%'">
             <el-form-item label="">
               <el-input v-model="invoiceData.taxRate"></el-input>
             </el-form-item>

src/views/ecw/financial/payable.vue

@@ -348,7 +348,7 @@ export default {
     },
     deleteClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除该应付款?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除该应付款')+'?').then(function() {
         return deletePayable(id);
       }).then(() => {
         this.getList();

src/views/ecw/financial/paymentDetail.vue

@@ -159,8 +159,8 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate" />
-        <el-table-column :label="$t('税率%')" align="center" prop="taxRate" />
-        <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" >
+        <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}}</span>

src/views/ecw/financial/paymentExamine.vue

@@ -58,12 +58,12 @@
             <el-input v-model="scope.row.exchangeRate"></el-input>
           </template> -->
         </el-table-column>
-        <el-table-column :label="$t('税率%')" align="center" prop="taxRate" >
+        <el-table-column :label="$t('税率')+'%'" align="center" prop="taxRate" >
           <!-- <template slot-scope="scope">
             <el-input v-model="scope.row.taxRate"></el-input>
           </template> -->
         </el-table-column>
-        <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" />
+        <el-table-column :label="$t('价税合计')+'(RMB)'" align="center" prop="total" />
       </el-table>
 
       <el-descriptions :column="1" class="card" border>

src/views/ecw/financial/paymentVoucher.vue

@@ -302,7 +302,7 @@ export default {
     },
     deleteClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除该付款单?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除该付款单')+'?').then(function() {
         return deletePayment(id);
       }).then(() => {
         this.getList();
@@ -311,7 +311,7 @@ export default {
     },
     verificationClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('您确认要核销吗?')).then(function() {
+      this.$modal.confirm(this.$t('您确认要核销吗')+'?').then(function() {
         return paymentVerification(id);
       }).then(() => {
         this.getList();
@@ -320,7 +320,7 @@ export default {
     },
     verificationCancelClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('您确认要反核销吗?')).then(function() {
+      this.$modal.confirm(this.$t('您确认要反核销吗')+'?').then(function() {
         return paymentVerificationCancel(id);
       }).then(() => {
         this.getList();
@@ -329,7 +329,7 @@ export default {
     },
     verifyCancelClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('您确认要反审核吗?')).then(function() {
+      this.$modal.confirm(this.$t('您确认要反审核吗')+'?').then(function() {
         return paymentVerifyCancel(id);
       }).then(() => {
         this.getList();

src/views/ecw/financial/printPaymentVoucher.vue

@@ -102,7 +102,7 @@
       return {
         loadings: false,
         form:{},
-        title:'收款单',
+        title:this.$t('收款单'),
          creatorData:[],
          list:[],
          fileList:[],

src/views/ecw/financial/printVoucher.vue

@@ -2,7 +2,7 @@
   <div class="app-container" >
       <div id="print" style="font-size: 18px;">
 
-        <div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">捷道货运收款单</div>
+        <div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">{{$t('捷道货运收款单')}}</div>
           <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
             <tr>
               <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
@@ -107,7 +107,7 @@
       return {
         loadings: false,
         form:{},
-        title:'收款单',
+        title:this.$t('收款单'),
          // creatorData:[],
          list:[],
          fileList:[],

src/views/ecw/financial/receiptDetail.vue

@@ -102,7 +102,7 @@
           {{ form.projectName }}
           <!-- <el-input v-model="form.projectName"></el-input> -->
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('税率%')">
+        <el-descriptions-item :label="$t('税率')+'%'">
           {{ form.taxRate }}
           <!-- <el-input v-model="form.taxRate"></el-input> -->
         </el-descriptions-item>
@@ -839,7 +839,7 @@ export default {
     },
     deleteClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除该收款单?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除该收款单')+'?').then(function() {
         return deleteReceiptItem(id);
       }).then(() => {
         this.getList();
@@ -849,7 +849,7 @@ export default {
     verificationClick(row) {
       const id = row.id;
       this.$modal
-        .confirm(this.$t('您确认要核销吗?'))
+        .confirm(this.$t('您确认要核销吗')+'?')
         .then(function () {
           return receiptItemVerification(id);
         })
@@ -862,7 +862,7 @@ export default {
     verificationCancelClick(row) {
       const id = row.id;
       this.$modal
-        .confirm(this.$t('您确认要反核销吗?'))
+        .confirm(this.$t('您确认要反核销吗')+'?')
         .then(function () {
           return receiptItemVerificationCancel(id);
         })
@@ -877,12 +877,12 @@ export default {
     },
     batchVerification() {
       if (this.multipleSelection.length === 0) {
-        this.$modal.msgError(this.$t('请选择需要核销的收款明细！'));
+        this.$modal.msgError(this.$t('请选择需要核销的收款明细'));
         return
       }
       const params = { ids: this.multipleSelection.map(v => v.id).join(',') }
       this.$modal
-        .confirm(this.$t('您确认要核销吗?'))
+        .confirm(this.$t('您确认要核销吗'+'?'))
         .then(function () {
           return receiptItemBatchVerification(params);
         })
@@ -897,11 +897,11 @@ export default {
     },
     verificationAll() {
       if(!this.detailed||this.detailed.length==0){
-        this.$modal.msgError(this.$t('当前收款单未添加银行收款明细，无法全部核销，请添加银行收款单明细，并核销所有实收明细后再进行全部核销！'));
+        this.$modal.msgError(this.$t('当前收款单未添加银行收款明细，无法全部核销，请添加银行收款单明细，并核销所有实收明细后再进行全部核销'));
         return
       }
       this.$modal
-        .confirm(this.$t('您确认要全部核销吗?'))
+        .confirm(this.$t('您确认要全部核销吗'+'?'))
         .then(() => {
           return receiptItemAllVerification(this.id);
         })
@@ -998,7 +998,7 @@ export default {
       this.loading.close();
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(this.$t('确定移除?')).then(res => {
+      return this.$confirm(this.$t('确定移除')+'?').then(res => {
         setTimeout(() => {
           this.addForm.attr = fileList.map(v => ({ name: v.name, url: v.response ? v.response.data : v.url }))
         }, 300)

src/views/ecw/financial/voucher.vue

@@ -361,7 +361,7 @@ export default {
     },
     deleteClick(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除该收款单?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除该收款单')+'?').then(function() {
         return deleteReceipt(id);
       }).then(() => {
         this.getList();

src/views/member/user/index.vue

@@ -341,15 +341,14 @@ export default {
   },
   methods: {
     deleteFn(row){
-      console.log(row)
-      this.$modal.confirm(`${this.$t('是否要删除昵称为')}${row.nickname}的会员`).then(function (){
+      const nickname = row.nickname;
+      this.$modal.confirm(`${this.$t('是否确认删除昵称为{nickname}的会员?', {nickname})}`).then(function (){
             return deleteUser(row.id)
       }).then( res => {
         if(res.code === 0) this.getList(); this.$message.success(this.$t('删除成功'))
       }).catch(() =>{
-        this.$message.success(this.$t('删除失败'))
+        // this.$message.success(this.$t('删除失败'))
         }
-
       )
     },
     //导出

src/views/member/user/underReview.vue

@@ -180,12 +180,14 @@ export default {
   },
   methods: {
     deleteFn(row){
-      this.$modal.confirm(`${this.$t('是否要删除昵称为')}${row.nickname}${this.$t('的会员')}`).then(function (){
+      // this.$modal.confirm(`${this.$t('是否要删除昵称为')}${row.nickname}${this.$t('的会员')}`).then(function (){
+      const nickname = row.nickname;
+      this.$modal.confirm(`${this.$t('是否确认删除昵称为{nickname}的会员?', {nickname})}`).then(function (){
         return deleteUser(row.id)
       }).then( res => {
         if(res.code === 0) this.getList(); this.$message.success(this.$t('删除成功'))
       }).catch(() =>{
-          this.$message.success(this.$t('删除失败'))
+        // this.$message.f(this.$t('取消删除'))
         }
 
       )