修改业务员下拉数据

明细新加字段
发票金额 换字段

src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -109,6 +109,10 @@
         <el-tag style="margin-right: 2px; color: #000000">应付(USD):{{ allCUSDSum | formatNumber }}</el-tag>
         <el-tag style="margin-right: 2px; color: #000000">应付合计(CNY):{{ allCSum | formatNumber }}</el-tag>
       </template>
+      <template slot="customSelectedHeader" slot-scope="{ column }">
+        <el-button v-if="customselectList.length == 0" type="text" @click="customSelectionAll('全选')">全选</el-button>
+        <el-button v-if="customselectList.length" type="text" @click="customSelectionAll('取消')">取消</el-button>
+      </template>
       <template slot="customSelected" slot-scope="{ row }">
         <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
       </template>
@@ -383,14 +387,14 @@ export default {
               },
             ],
           },
-          // {
-          //   label: "签收日期",
-          //   prop: "signforDate",
-          //   type: "date",
-          //   format: "yyyy-MM-dd",
-          //   width: 80,
-          //   overHidden: true,
-          // },
+          {
+            label: "签收日期",
+            prop: "signforDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            width: 80,
+            overHidden: true,
+          },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
@@ -409,12 +413,12 @@ export default {
           //   width: 80,
           //   overHidden: true,
           // },
-          {
-            label: "结算单金额",
-            prop: "stlAmount",
-            width: 80,
-            overHidden: true,
-          },
+          // {
+          //   label: "结算单金额",
+          //   prop: "stlAmount",
+          //   width: 80,
+          //   overHidden: true,
+          // },
           // {
           //   label: "销账日期",
           //   prop: "clearedDate",
@@ -424,12 +428,43 @@ export default {
           //   overHidden: true,
           // },
           {
+            label: "审核日期",
+            prop: "approvedDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            width: 80,
+            overHidden: true,
+          },
+          {
             label: "操作员",
             prop: "operatorName",
             width: 80,
             overHidden: true,
           },
           {
+            label: "业务员",
+            prop: "srcCnName",
+            width: 80,
+            overHidden: true,
+          },
+          {
+            label: "业务类型",
+            prop: "businessType",
+            type: "select",
+            dicData: [
+              {
+                label: "海运出口",
+                value: "SE",
+              },
+              {
+                label: "海运进口",
+                value: "SI",
+              },
+            ],
+            width: 100,
+            overHidden: true,
+          },
+          {
             label: "订舱号",
             prop: "bookingNo",
             width: 80,
@@ -625,6 +660,21 @@ export default {
       //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
       // }
     },
+    customSelectionAll(type) {
+      this.lastCustomSelectedRowIndex = null;
+      if (type == "全选") {
+        this.pageData.forEach((item) => {
+          item.customSelected = true;
+        });
+        this.customselectList = this.pageData.filter((item) => item.customSelected == true);
+      }
+      if (type == "取消") {
+        this.pageData.forEach((item) => {
+          item.customSelected = false;
+        });
+        this.customselectList = [];
+      }
+    },
     customSelection(row) {
       //  lastCustomSelectedRowIndex
       const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
@@ -1202,18 +1252,17 @@ export default {
         this.allCRMBSum = 0;
         this.allCUSDSum = 0;
         this.allCSum = 0;
-        console.log(oldValue)
         if (oldValue.length) {
           oldValue.forEach((e) => {
             if (e.dc == "D") {
               this.allDRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allDUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              this.allDSum+=this.allDRMBSum+this.allDUSDSum*e.currentStlExrate
+              this.allDSum += this.allDRMBSum + this.allDUSDSum * e.currentStlExrate;
             }
             if (e.dc == "C") {
               this.allCRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allCUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              this.allCSum+=this.allCRMBSum+this.allCUSDSum*e.currentStlExrate
+              this.allCSum += this.allCRMBSum + this.allCUSDSum * e.currentStlExrate;
             }
           });
         }

src/views/iosBasicData/financialManagement/finstlbills/components/queryData.vue

@@ -28,6 +28,10 @@
         <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 | formatNumber }}</el-tag>
         <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 | formatNumber }}</el-tag>
       </template>
+      <template slot="customSelectedHeader" slot-scope="{ column }">
+        <el-button v-if="customselectList.length == 0" type="text" @click="customSelectionAll('全选')">全选</el-button>
+        <el-button v-if="customselectList.length" type="text" @click="customSelectionAll('取消')">取消</el-button>
+      </template>
       <template slot="customSelected" slot-scope="{ row }">
         <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
       </template>
@@ -76,22 +80,22 @@
         <span v-else>{{ row.reconciliationAmountUsd }}</span>
       </template>
       <template slot="stlAmountDr" slot-scope="{ row }">
-        <el-popover trigger="click" v-if="Number(row.dc=='D'?row.stlAmountDr:row.stlAmountCr)">
+        <el-popover trigger="click" v-if="Number(row.dc == 'D' ? row.stlAmountDr : row.stlAmountCr)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
           <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
-            {{ row.dc=='D'?row.stlAmountDr:row.stlAmountCr }}
+            {{ row.dc == "D" ? row.stlAmountDr : row.stlAmountCr }}
           </span>
         </el-popover>
-        <span v-else>{{ row.dc=='D'?row.stlAmountDr:row.stlAmountCr }}</span>
+        <span v-else>{{ row.dc == "D" ? row.stlAmountDr : row.stlAmountCr }}</span>
       </template>
       <template slot="stlAmountDrUsd" slot-scope="{ row }">
-        <el-popover trigger="click" v-if="Number(row.dc=='D'?row.stlAmountDrUsd:row.stlAmountCrUsd)">
+        <el-popover trigger="click" v-if="Number(row.dc == 'D' ? row.stlAmountDrUsd : row.stlAmountCrUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
           <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
-            {{ row.dc=='D'?row.stlAmountDrUsd:row.stlAmountCrUsd }}
+            {{ row.dc == "D" ? row.stlAmountDrUsd : row.stlAmountCrUsd }}
           </span>
         </el-popover>
-        <span v-else> {{ row.dc=='D'?row.stlAmountDrUsd:row.stlAmountCrUsd }}</span>
+        <span v-else> {{ row.dc == "D" ? row.stlAmountDrUsd : row.stlAmountCrUsd }}</span>
       </template>
       <template slot-scope="{ row, index }" slot="menu">
         <el-button type="text" size="small" @click="rowCell(row, index)"> {{ row.$cellEdit ? "保存" : "编辑" }} </el-button>
@@ -106,6 +110,7 @@ import { feecenterSelectByAccNoList, getListAll } from "@/api/iosBasicData/finst
 export default {
   data() {
     return {
+      allCustomSelected: false,
       amountDSubSum: 0,
       amountDSubUsdSum: 0,
       amountCSubSum: 0,
@@ -265,14 +270,14 @@ export default {
               },
             ],
           },
-          // {
-          //   label: "签收日期",
-          //   prop: "signforDate",
-          //   type: "date",
-          //   format: "yyyy-MM-dd",
-          //   width: 80,
-          //   overHidden: true,
-          // },
+          {
+            label: "签收日期",
+            prop: "signforDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            width: 80,
+            overHidden: true,
+          },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
@@ -291,12 +296,12 @@ export default {
           //   width: 80,
           //   overHidden: true,
           // },
-          {
-            label: "结算单金额",
-            prop: "stlAmount",
-            width: 80,
-            overHidden: true,
-          },
+          // {
+          //   label: "结算单金额",
+          //   prop: "stlAmount",
+          //   width: 80,
+          //   overHidden: true,
+          // },
           // {
           //   label: "销账日期",
           //   prop: "clearedDate",
@@ -306,12 +311,43 @@ export default {
           //   overHidden: true,
           // },
           {
+            label: "审核日期",
+            prop: "approvedDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            width: 80,
+            overHidden: true,
+          },
+          {
             label: "操作员",
             prop: "operatorName",
             width: 80,
             overHidden: true,
           },
           {
+            label: "业务员",
+            prop: "srcCnName",
+            width: 80,
+            overHidden: true,
+          },
+          {
+            label: "业务类型",
+            prop: "businessType",
+            type: "select",
+            dicData: [
+              {
+                label: "海运出口",
+                value: "SE",
+              },
+              {
+                label: "海运进口",
+                value: "SI",
+              },
+            ],
+            width: 100,
+            overHidden: true,
+          },
+          {
             label: "订舱号",
             prop: "bookingNo",
             width: 80,
@@ -497,6 +533,21 @@ export default {
       //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
       // }
     },
+    customSelectionAll(type) {
+      this.lastCustomSelectedRowIndex = null;
+      if (type == "全选") {
+        this.pageData.forEach((item) => {
+          item.customSelected = true;
+        });
+        this.customselectList = this.pageData.filter((item) => item.customSelected == true);
+      }
+      if (type == "取消") {
+        this.pageData.forEach((item) => {
+          item.customSelected = false;
+        });
+        this.customselectList = [];
+      }
+    },
     customSelection(row) {
       //  lastCustomSelectedRowIndex
       const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
@@ -699,15 +750,16 @@ export default {
           item.billNo = item.businessBillDivideNo ? item.businessBillDivideNo : item.businessBillNo;
           item.dc = item.accountDc; // 收付
           item.isSignfor = item.isSignFor;
+          item.signforDate = item.signforDate?item.signforDate+' 00:00:00':null;
           // item.isChecked = 0;
           if (item.curCode == "CNY") {
             this.$set(item, "amountRMB", item.amount);
-            this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
+            this.$set(item, "currentInvoiceAmountRMB", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(0));
           } else {
             this.$set(item, "amountUSD", item.amount);
-            this.$set(item, "currentInvoiceAmountUSD", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
+            this.$set(item, "currentInvoiceAmountUSD", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(0));
           }

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -98,12 +98,12 @@
             <dic-select
               v-model="form.srcCnName"
               placeholder="业务员"
-              label="name"
+              label="cname"
               res="records"
-              url="/blade-user/page?current=1&size=10"
+              url="/blade-los/bstaffinformation/list?current=1&size=10&positionType=业务员&status=0&whetherEmployedOrNot=1"
               :filterable="true"
               :remote="true"
-              dataName="account"
+              dataName="cname"
               @selectChange="dicChange('srcCnName', $event)"
               :disabled="editDisabled"
             ></dic-select>
@@ -819,10 +819,10 @@ export default {
       if (name == "srcCnName") {
         if (row) {
           this.form.srcId = row.id;
-          this.form.srcEnName = row.name;
+          this.form.srcEnName = row.ename;
         } else {
           this.form.srcId = null;
-          this.form.srcEnName = null;
+          this.form.srcCnName = null;
           this.form.srcEnName = null;
         }
       }
@@ -868,7 +868,7 @@ export default {
         if (this.form.finStlBillsItemsList.length == 0) {
           return this.$message.error("选定数据不能为空");
         }
-        if (this.form.operatingType == '付费申请') {
+        if (this.form.operatingType == "付费申请") {
           getListAllDetail({ srcId: this.form.id }).then((res) => {
             if (
               Number(this.form.amountDr) != Number(this.form.actualAmountDr) ||
@@ -894,7 +894,7 @@ export default {
             }
           });
         }
-        if (this.form.operatingType != '付费申请') {
+        if (this.form.operatingType != "付费申请") {
           this.$confirm("确定进行确认完成操作?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -1197,7 +1197,7 @@ export default {
             item.customSelected = false;
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
-              this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
+              this.$set(item, "currentInvoiceAmountRMB", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
               this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
@@ -1205,7 +1205,7 @@ export default {
               this.$set(item, "stlAmountDrUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
-              this.$set(item, "currentInvoiceAmountUSD", item.currentInvoiceAmount);
+              this.$set(item, "currentInvoiceAmountUSD", Number(item.appliedInvoiceAmount ? item.appliedInvoiceAmount : 0));
               this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));