Просмотр исходного кода

修改合计
邮箱修改提示

Qukatie 1 неделя назад
Родитель
Сommit
cac3f8aa09

+ 1 - 1
src/components/iosbasic-data/mail-component.vue

@@ -3,7 +3,7 @@
         custom-class="email-dialog">
         <el-form ref="emailForm" :model="formData" :rules="formRules" label-width="80px" label-position="right">
             <el-form-item label="收件人" prop="to">
-                <el-input v-model="formData.to" placeholder="多个收件人用分号(;)分隔" clearable></el-input>
+                <el-input v-model="formData.to" placeholder="请输入收件人邮箱 多个邮箱用(;)分隔" clearable></el-input>
             </el-form-item>
 
             <el-form-item label="抄送" prop="cc">

+ 2 - 2
src/views/approveDataH/component/mail-component.vue

@@ -10,7 +10,7 @@
   >
     <el-form ref="emailForm" :model="formData" :rules="formRules" label-width="80px" label-position="right">
       <el-form-item label="收件人" prop="to">
-        <el-input v-model="formData.to" placeholder="多个收件人用分号(;)分隔" clearable></el-input>
+        <el-input v-model="formData.to" placeholder="请输入收件人邮箱 多个邮箱用(;)分隔" clearable></el-input>
       </el-form-item>
 
       <el-form-item label="抄送" prop="cc">
@@ -253,7 +253,7 @@ export default {
             let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0];
             this.$store.commit("DEL_TAG", tag1);
             this.$router.push({
-              path: "/approveData/index",
+              path: "/approveDataH/index",
               query: { check: "refresh" }
             });
           }

+ 24 - 24
src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -283,30 +283,6 @@ export default {
             overHidden: true
           },
           {
-            label: "业务员",
-            prop: "srcCnName",
-            width: 80,
-            overHidden: true
-          },
-          {
-            label: "操作人",
-            prop: "operatorName",
-            width: 80,
-            overHidden: true
-          },
-          {
-            label: "币种",
-            prop: "currentStlCurCode",
-            width: 60,
-            overHidden: true
-          },
-          {
-            label: "汇率",
-            prop: "currentStlExrate",
-            width: 80,
-            overHidden: true
-          },
-          {
             label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
@@ -331,6 +307,30 @@ export default {
             overHidden: true
           },
           {
+            label: "业务员",
+            prop: "srcCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "操作人",
+            prop: "operatorName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "币种",
+            prop: "currentStlCurCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentStlExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
             label: "ETD",
             prop: "etd",
             width: 90,

+ 24 - 24
src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems2.vue

@@ -284,30 +284,6 @@ export default {
             overHidden: true
           },
           {
-            label: "业务员",
-            prop: "srcCnName",
-            width: 80,
-            overHidden: true
-          },
-          {
-            label: "操作人",
-            prop: "operatorName",
-            width: 80,
-            overHidden: true
-          },
-          {
-            label: "币种",
-            prop: "currentStlCurCode",
-            width: 60,
-            overHidden: true
-          },
-          {
-            label: "汇率",
-            prop: "currentStlExrate",
-            width: 80,
-            overHidden: true
-          },
-          {
             label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
@@ -332,6 +308,30 @@ export default {
             overHidden: true
           },
           {
+            label: "业务员",
+            prop: "srcCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "操作人",
+            prop: "operatorName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "币种",
+            prop: "currentStlCurCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentStlExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
             label: "ETD",
             prop: "etd",
             width: 90,

+ 80 - 7
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -419,8 +419,24 @@
               @deletefun="finstlbillsitemsRemovefun"
             >
               <template slot="menuLeft">
-                <div>
+                <div style="display: flex;">
                   <el-button size="small" type="success" :disabled="editSave" :loading="saveLoading" @click="SelectedRows">确认选定行</el-button>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span>应收:</span>
+                    <span class="weightnum">¥{{ amountDSubSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountDSubUsdSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span>应付:</span>
+                    <span class="weightnum">¥{{ amountCSubSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountCSubUsdSum || 0 }}</span>
+                  </div>
                 </div>
               </template>
             </query-finstlbillsitems>
@@ -436,7 +452,7 @@
               @deletefun="finstlbillsitemsRemovefun"
             >
               <template slot="menuLeft">
-                <div>
+                <div style="display:flex">
                   <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editSave" :loading="saveLoading" @click="batchDeletefun"
                     >一键删除
                   </el-button>
@@ -465,6 +481,22 @@
                   <el-button style="margin-left: 10px" :disabled="editSave" size="small" type="primary" @click="invoiceMatchingfun()"
                     >匹配金额</el-button
                   >
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span>应收:</span>
+                    <span class="weightnum">¥{{ amountDSubSum2 || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountDSubUsdSum2 || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span>应付:</span>
+                    <span class="weightnum">¥{{ amountCSubSum2 || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountCSubUsdSum2 || 0 }}</span>
+                  </div>
                 </div>
               </template>
             </finstlbillsitems>
@@ -634,6 +666,14 @@ export default {
   },
   data() {
     return {
+      amountDSubSum: 0,
+      amountDSubUsdSum: 0,
+      amountCSubSum: 0,
+      amountCSubUsdSum: 0,
+      amountDSubSum2: 0,
+      amountDSubUsdSum2: 0,
+      amountCSubSum2: 0,
+      amountCSubUsdSum2: 0,
       activeName: "1",
       checkId: "", // 审核需要的id
       batchNo: "",
@@ -979,7 +1019,7 @@ export default {
     },
     allClick(name) {
       if (name == "指示") {
-        this.$refs.cashier.openDialog(this.form,this.tableData,'auto');
+        this.$refs.cashier.openDialog(this.form, this.tableData, "auto");
       }
     },
     updateCashier() {
@@ -1203,7 +1243,7 @@ export default {
       this.$set(this.form, "corpArgreementNo", row.enName);
       this.retrievePopupsType = false;
       this.bcorpsbankListfun();
-      this.finstlbillslistAccBillV1fun('检索');
+      this.finstlbillslistAccBillV1fun("检索");
     },
     //请核关闭
     choceScheduleFun() {
@@ -1221,7 +1261,7 @@ export default {
           return this.$message.warning("请填写对账单位");
         }
         console.log("原来的接口");
-        this.finstlbillslistAccBillV1fun('检索');
+        this.finstlbillslistAccBillV1fun("检索");
       }
     },
     // 检索弹窗数据
@@ -1331,7 +1371,7 @@ export default {
                 this.queryData.push(item);
               }
             }
-            if (this.queryData.length == 0&&type=='检索') {
+            if (this.queryData.length == 0 && type == "检索") {
               this.$message.warning("当前检索暂无数据!");
             }
           }
@@ -1412,7 +1452,7 @@ export default {
                 this.queryData.push(item);
               }
             }
-            if (this.queryData.length == 0&&type=='检索') {
+            if (this.queryData.length == 0 && type == "检索") {
               this.$message.warning("当前检索暂无数据!");
             }
           }
@@ -1481,10 +1521,43 @@ export default {
       this.editCustomer("选定行");
     },
     addSelectionChange(arr) {
+      this.amountDSubSum = 0;
+      this.amountDSubUsdSum = 0;
+      this.amountCSubSum = 0;
+      this.amountCSubUsdSum = 0;
+      if (arr.length) {
+        arr.forEach(e => {
+          console.log(e.accountDc);
+          if (e.dc == "D") {
+            this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+          if (e.dc == "C") {
+            this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+        });
+      }
       this.addData = arr;
     },
     // 下面表格多选
     handleSelectionChange(arr) {
+      this.amountDSubSum2 = 0;
+      this.amountDSubUsdSum2 = 0;
+      this.amountCSubSum2 = 0;
+      this.amountCSubUsdSum2 = 0;
+      if (arr.length) {
+        arr.forEach(e => {
+          if (e.dc == "D") {
+            this.amountDSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountDSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+          if (e.dc == "C") {
+            this.amountCSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountCSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+        });
+      }
       this.handleSelectionData = arr;
     },
     //返回列表

+ 67 - 8
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -681,19 +681,19 @@
                   </el-button>
                   <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
                     <span>应收:</span>
-                    <span class="weightnum">¥{{ form.amountDr || 0 }}</span>
+                    <span class="weightnum">¥{{ amountDSubSum2 || 0 }}</span>
                   </div>
                   <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
                     <span></span>
-                    <span class="weightnum">${{ form.amountDrUsd || 0 }}</span>
+                    <span class="weightnum">${{ amountDSubUsdSum2 || 0 }}</span>
                   </div>
                   <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
                     <span>应付:</span>
-                    <span class="weightnum">¥{{ form.amountCr || 0 }}</span>
+                    <span class="weightnum">¥{{ amountCSubSum2 || 0 }}</span>
                   </div>
                   <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
                     <span></span>
-                    <span class="weightnum">${{ form.amountCrUsd || 0 }}</span>
+                    <span class="weightnum">${{ amountCSubUsdSum2 || 0 }}</span>
                   </div>
                 </div>
               </template>
@@ -735,7 +735,46 @@
         </el-tabs>
       </el-card>
     </div>
-
+    <el-card style="margin-top: 10px">
+      <el-row>
+        <el-col :span="3">
+          <div class="bottomFlex" style="color: #6BBCD1">
+            <span>应付:</span>
+            <span class="weightnum">¥{{ form.amountCr || 0 }}</span>
+          </div>
+        </el-col>
+        <el-col :span="3">
+          <div class="bottomFlex" style="color: #6BBCD1">
+            <span>应付:</span>
+            <span class="weightnum">${{ form.amountCrUsd || 0 }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="bottomFlex" style="color: #6BBCD1">
+            <span>应付合计:</span>
+            <span class="weightnum">¥{{ form.amountCrLoc || 0 }}</span>
+          </div>
+        </el-col>
+        <el-col :span="3">
+          <div class="bottomFlex" style="color: #81B337">
+            <span>应收:</span>
+            <span class="weightnum">¥{{ form.amountDr || 0 }}</span>
+          </div>
+        </el-col>
+        <el-col :span="3">
+          <div class="bottomFlex" style="color: #81B337">
+            <span>应收:</span>
+            <span class="weightnum">${{ form.amountDrUsd || 0 }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="bottomFlex" style="color: #81B337">
+            <span>应收合计:</span>
+            <span class="weightnum">¥{{ form.amountDrLoc || 0 }}</span>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
     <!--选择数据弹窗-->
     <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%" :close-on-click-modal="false">
       <div>
@@ -857,6 +896,10 @@ export default {
       amountDSubUsdSum: 0,
       amountCSubSum: 0,
       amountCSubUsdSum: 0,
+      amountDSubSum2: 0,
+      amountDSubUsdSum2: 0,
+      amountCSubSum2: 0,
+      amountCSubUsdSum2: 0,
       activeName: "1",
       retrievePopupsType: false, // 弹窗开启关闭
       retrievePopupsData: [], // 选择弹窗数据
@@ -1172,7 +1215,7 @@ export default {
         for (let [key, value] of Object.entries(res.data.data)) {
           this.$set(row, key, value);
         }
-        this.$set(row, 'edit', false);
+        this.$set(row, "edit", false);
       });
     },
     // 开票一键删除
@@ -2067,11 +2110,11 @@ export default {
       if (arr.length) {
         arr.forEach(e => {
           console.log(e.accountDc);
-          if (e.accountDc == "D") {
+          if (e.dc == "D") {
             this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
             this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
           }
-          if (e.accountDc == "C") {
+          if (e.dc == "C") {
             this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
             this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
           }
@@ -2081,6 +2124,22 @@ export default {
     },
     // 下面表格多选
     handleSelectionChange(arr) {
+      this.amountDSubSum2 = 0;
+      this.amountDSubUsdSum2 = 0;
+      this.amountCSubSum2 = 0;
+      this.amountCSubUsdSum2 = 0;
+      if (arr.length) {
+        arr.forEach(e => {
+          if (e.dc == "D") {
+            this.amountDSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountDSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+          if (e.dc == "C") {
+            this.amountCSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountCSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+        });
+      }
       this.handleSelectionData = arr;
     },
     //返回列表

+ 1 - 1
src/views/payApproval/component/mail-component.vue

@@ -10,7 +10,7 @@
   >
     <el-form ref="emailForm" :model="formData" :rules="formRules" label-width="80px" label-position="right">
       <el-form-item label="收件人" prop="to">
-        <el-input v-model="formData.to" placeholder="多个收件人用分号(;)分隔" clearable></el-input>
+        <el-input v-model="formData.to" placeholder="请输入收件人邮箱 多个邮箱用(;)分隔" clearable></el-input>
       </el-form-item>
 
       <el-form-item label="抄送" prop="cc">