货代审核报表 2023-11-27

src/api/iosBasicData/bcorps.js

@@ -70,3 +70,11 @@ export const updateBcorps = (row) => {
   })
 }
 
+// 获取银行列表
+export const bcorpsbankList = (row) => {
+  return request({
+    url: '/api/blade-los/bcorpsbank/list',
+    method: 'post',
+    data: row
+  })
+}

src/views/approveDataH/check.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-  import { approvePass,batchOperation } from "@/api/approveDataL/main";
+  import { approvePass,batchOperation } from "@/api/approveDataH/main";
   import {offset} from "@/api/basicData/salesOrder";
 
   export default {

src/views/approveDataH/index.vue

@@ -85,13 +85,17 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
       </check-schedule>
     </el-dialog>
-    <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
-      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-      <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
-        @choceCheckFun="choceCheckFun">
-      </check>
-    </el-dialog>
-    <reportContainer style="width: 100%; height: 80%" ref="reportContainer"></reportContainer>
+    <!--<el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"-->
+    <!--  :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>-->
+    <!--  <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"-->
+    <!--    @choceCheckFun="choceCheckFun">-->
+    <!--  </check>-->
+    <!--</el-dialog>-->
+    <reportContainerlos style="width: 100%; height: 100vh" ref="reportContainer">
+        <check :checkData="checkData" :checkDetail="true" :idList="idList" @operationType="operationType"
+               @choceCheckFun="choceCheckFun">
+        </check>
+    </reportContainerlos>
   </basic-container>
 </template>
 
@@ -107,7 +111,7 @@ import { getUserInfo } from "@/api/system/user";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import {corpsDescListAll} from "../../api/tirePartsMall/salesManagement/saleOrder";
 
-import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
+import reportContainerlos from "@/views/iosBasicData/report-container/report-container-los.vue"
 import {finstlbillsDetail} from "../../api/iosBasicData/finstlbills";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 
@@ -117,7 +121,7 @@ export default {
   components: {
     check,
     checkSchedule,
-    reportContainer
+      reportContainerlos
   },
   data() {
     return {
@@ -200,12 +204,23 @@ export default {
   methods: {
     // 预览报表
     async handleReportPreview(url,row){
+        this.checkData = row
         const res = await reportsGetReportData({
             billId:row.billId,
             reportCode:'FYSH',
             groupCode:2,
         })
         var data = res.data.data.data
+        // 报表取的是最后一项，把第一项的数据赋值给最后一项
+        data[data.length - 1].amountDrUsd = data[0].amountDrUsd
+        data[data.length - 1].amountDr = data[0].amountDr
+        data[data.length - 1].amountCrUsd = data[0].amountCrUsd
+        data[data.length - 1].amountCr = data[0].amountCr
+        data[data.length - 1].amountProfitUsd = data[0].amountProfitUsd
+        data[data.length - 1].amountProfit = data[0].amountProfit
+        data[data.length - 1].amountProfitLoc = data[0].amountProfitLoc
+        data[data.length - 1].rate = data[0].rate
+        data[data.length - 1].grossMargin = data[0].grossMargin
 
         console.log(row,203)
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
@@ -311,7 +326,8 @@ export default {
       this.checkDialog = true;
     },
     operationType() {
-      this.checkDialog = false;
+      // this.checkDialog = false;
+        this.$refs.reportContainer.visible = false
       this.refreshChange();
       this.idList = [];
     },
@@ -391,7 +407,8 @@ export default {
       }
     },
     choceCheckFun() {
-      this.checkDialog = false;
+      // this.checkDialog = false;
+        this.$refs.reportContainer.visible = false
       this.refreshChange();
     },
     openCheckSchedule(row) {

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -648,7 +648,7 @@
           <el-form-item label="币别" prop="curId">
             <!-- <el-input v-model="corpsAttnForm.curId"></el-input> -->
             <search-query ref="SearchQuery" :datalist="rateOptions" title="币别" :filterable="true" :clearable="true"
-              :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'code', disabled: 'status' }"
+              :remote="true" :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
               :disabledStatus="1" @remoteMethod="rateListfun" @corpChange="rateChange">
               <rateManagement></rateManagement>
             </search-query>
@@ -1203,11 +1203,12 @@ export default {
         }
       }
     },
+      // 银行信息币别回调
     rateChange(value) {
-      this.corpsAttnForm.curId = value
       for (let item of this.rateOptions) {
-        if (item.id == value) {
-          this.corpsAttnForm.curNo = item.cnName
+        if (item.code == value) {
+          this.corpsAttnForm.curId = item.id
+          this.corpsAttnForm.curNo = item.code
         }
       }
     },

src/views/iosBasicData/fininvoices/assembly/fininvoicesitems.vue

@@ -196,15 +196,154 @@
                 prop="feeId"
                 label="费用 Id">
             </el-table-column>
-
-
-
-
-
-
-
-
-
+            <el-table-column
+                prop="feeCode"
+                label="费用编号">
+            </el-table-column>
+            <el-table-column
+                prop="feeCnName"
+                label="费用中文名称">
+            </el-table-column>
+            <el-table-column
+                prop="feeEnName"
+                label="费用英文名称">
+            </el-table-column>
+            <el-table-column
+                prop="paymode"
+                label="付款方式">
+            </el-table-column>
+            <el-table-column
+                prop="accBillId"
+                label="账单 Id">
+            </el-table-column>
+            <el-table-column
+                prop="accBillNo"
+                label="账单编号">
+            </el-table-column>
+            <el-table-column
+                prop="accDate"
+                label="账单日期">
+            </el-table-column>
+            <el-table-column
+                prop="dc"
+                label="费用收付">
+            </el-table-column>
+            <el-table-column
+                prop="quantity"
+                label="数量">
+            </el-table-column>
+            <el-table-column
+                prop="unitNo"
+                label="单位">
+            </el-table-column>
+            <el-table-column
+                prop="price"
+                label="单价">
+            </el-table-column>
+            <el-table-column
+                prop="curCode"
+                label="原币种">
+            </el-table-column>
+            <el-table-column
+                prop="exrate"
+                label="原汇率">
+            </el-table-column>
+            <el-table-column
+                prop="isTax"
+                label="是否含税">
+            </el-table-column>
+            <el-table-column
+                prop="taxType"
+                label="税种">
+            </el-table-column>
+            <el-table-column
+                prop="taxRate"
+                label="税率%">
+            </el-table-column>
+            <el-table-column
+                prop="surchargeRate"
+                label="附加税率%">
+            </el-table-column>
+            <el-table-column
+                prop="amountDiscount"
+                label="折扣金额">
+            </el-table-column>
+            <el-table-column
+                prop="amountTax"
+                label="税额">
+            </el-table-column>
+            <el-table-column
+                prop="amountNet"
+                label="去税金额">
+            </el-table-column>
+            <el-table-column
+                prop="amount"
+                label="金额">
+            </el-table-column>
+            <el-table-column
+                prop="amountTaxLoc"
+                label="本币税额">
+            </el-table-column>
+            <el-table-column
+                prop="amountNetLoc"
+                label="本币去税金额">
+            </el-table-column>
+            <el-table-column
+                prop="amountDiscountLoc"
+                label="本币折扣金额">
+            </el-table-column>
+            <el-table-column
+                prop="amountLoc"
+                label="本币金额">
+            </el-table-column>
+            <el-table-column
+                prop="description"
+                label="收费内容">
+            </el-table-column>
+            <el-table-column
+                prop="descriptionMerge"
+                label="合并收费内容">
+            </el-table-column>
+            <el-table-column
+                prop="currentCurCode"
+                label="本次发票币种">
+            </el-table-column>
+            <el-table-column
+                prop="currentExrate"
+                label="本次发票汇率">
+            </el-table-column>
+            <el-table-column
+                prop="currentTaxRate"
+                label="本次发票税率">
+            </el-table-column>
+            <el-table-column
+                prop="currentSurRate"
+                label="本次发票附加税率">
+            </el-table-column>
+            <el-table-column
+                prop="currentAmountTax"
+                label="税额">
+            </el-table-column>
+            <el-table-column
+                prop="currentAmountNet"
+                label="去税金额">
+            </el-table-column>
+            <el-table-column
+                prop="currentAmount"
+                label="本次发票金额">
+            </el-table-column>
+            <el-table-column
+                prop="currentAmountLoc"
+                label="本次发票本币金额">
+            </el-table-column>
+            <el-table-column
+                prop="isChequeSigned"
+                label="支票是否签收">
+            </el-table-column>
+            <el-table-column
+                prop="isInvoiceSigned"
+                label="发票是否签收">
+            </el-table-column>
             <el-table-column
                 prop="lineNo"
                 label="备注">

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -254,11 +254,19 @@
                         <el-row>
                             <el-col :span="8">
                                 <el-form-item label="结算单位" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入结算单位" >
-                                    </el-input>
+                                    <search-query :datalist="corpData"
+                                                  :selectValue="form.corpCnName"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :buttonIf="false"
+                                                  :remote="true"
+                                                  :filterable="true"
+                                                  placeholder="请输入结算单位"
+                                                  :forParameter="{ key:'id', label:'cnName', value:'cnName'}"
+                                                  @corpChange="corpChange($event,'corpCnName')"
+                                                  @remoteMethod="corpBcorpsListfun"
+                                                  @corpFocus="corpBcorpsListfun" >
+                                    </search-query>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
@@ -433,7 +441,7 @@
                                 <el-button type="primary"
                                            size="small"
                                            icon="el-icon-service"
-                                           plain>提取费用
+                                           plain @click="finstlbillslistAccBillV1fun">提取费用
                                 </el-button>
                             </el-col>
                             <el-col :span="8">
@@ -484,13 +492,18 @@
 
 <script>
 import fininvoicesitems from "@/views/iosBasicData/fininvoices/assembly/fininvoicesitems.vue";
-    export default {
-        components:{fininvoicesitems},
+import {finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
+import {bcorpsbankList, getBcorpsList} from "@/api/iosBasicData/bcorps";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+
+export default {
+        components:{SearchQuery, fininvoicesitems},
         data() {
             return {
                 pageLoading:false, // 全屏加载
                 saveLoading:false, // 按钮加载
                 form:{},
+                corpData:[], // 结算单位数据
             }
         },
         props:{
@@ -500,10 +513,53 @@ import fininvoicesitems from "@/views/iosBasicData/fininvoices/assembly/fininvoi
             }
         },
         methods:{
+            // 下拉框的回调
+            corpChange(value,name){
+                // 结算单位
+                if (name == 'corpCnName') {
+                    if (!value) {
+                        this.$set(this.form,'corpId','')
+                        this.$set(this.form,'corpCnName','')
+                        this.$set(this.form,'corpEnName','')
+                        return
+                    }
+                    for(let item of this.corpData) {
+                        if (item.cnName == value) {
+                            this.$set(this.form,'corpId',item.id)
+                            this.$set(this.form,'corpCnName',item.cnName)
+                            this.$set(this.form,'corpEnName',item.enName)
+                        }
+                    }
+                }
+
+
+            },
+            // 检索
+            finstlbillslistAccBillV1fun(){
+                finstlbillslistAccBillV1().then(res=>{
+
+                })
+            },
             //返回列表
             backToList() {
                 this.$emit('goBack')
             },
+            // 获取客户名称数据 往来单位数据
+            corpBcorpsListfun(cnName){
+                getBcorpsList(1,10,{cnName}).then(res=>{
+                    this.corpData = res.data.data.records
+                })
+            },
+            // 根据往来单位选择调用银行数据
+            bcorpsbankListfun(){
+                bcorpsbankList({
+                    curNo:'',
+                    pid:''
+                }).then(res=>{
+                    console.log(res,556)
+                })
+            },
+
         },
     }
 </script>

src/views/iosBasicData/report-container/report-container-los.vue

@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    top="0"
+    width="100%"
+    height="100%"
+    style="width: 100%; height: 100%;"
+    :before-close="onClose"
+    :close-on-click-modal="false"
+    append-to-body
+    class="el-dialogDeep"
+    :fullscreen="true"
+  >
+    <div id="reportContainer" style="width: 100%; height: 78vh; padding: 0"></div>
+      <div class="slotDiv">
+          <div style="width: 80%;padding: 15px;box-sizing: border-box;box-shadow:1px 2px 8px rgba(0,0,0,.5)">
+              <slot></slot>
+          </div>
+      </div>
+  </el-dialog>
+</template>
+<script>
+
+export default {
+  data() {
+    return {
+      visible: false,
+      refreshFun: null,
+    };
+  },
+  props: {
+    switchDialog: {
+      type: Boolean,
+      default: false
+    },
+    reportName: {
+      type: String
+    },
+    reportId: {
+      type: String
+    },
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    onClose() {
+      this.visible = false;
+    },
+    showContainer(initFun, refreshFun) {
+      if (typeof initFun == 'function') {
+        initFun()
+      }
+      this.refreshFun = refreshFun
+      this.visible = true
+      console.log(window.reportContainer)
+      console.log('showContainer')
+    },
+    hideContainer() {
+      if (typeof this.refreshFun == 'function') {
+        this.refreshFun()
+      }
+      this.visible = false
+      console.log('hideContainer')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/deep/.el-dialog__header {
+  display: none;
+}
+.slotDiv {
+    width: 100%;
+    margin: 10px 0;
+    height: 20vh;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 999;
+}
+</style>

src/views/wel/home/xindongPower/xindongPower.vue

@@ -13,7 +13,7 @@
                     </div>
                 </div>
                 <div style="color: #53b2da" class="statisticsBottom">
-                    <span>当月销售额：¥{{typeFalse?'****':statisticsData.dealAmountM}}元</span>
+                    <span>当月成交额：¥{{typeFalse?'****':statisticsData.dealAmountM}}元</span>
                 </div>
                 <div class="position" v-if="saberUserInfo.role_name.indexOf('业务员') == -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
@@ -30,7 +30,7 @@
                     </div>
                 </div>
                 <div style="color: #69d1a0" class="statisticsBottom">
-                    <span>当月轮胎销售：{{typeFalse?'****':statisticsData.salesNumM}}条</span>
+                    <span>当月轮胎销售量：{{typeFalse?'****':statisticsData.salesNumM}}条</span>
                 </div>
                 <div class="position" v-if="saberUserInfo.role_name.indexOf('业务员') == -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
@@ -47,7 +47,7 @@
                     </div>
                 </div>
                 <div style="color: #c865d7" class="statisticsBottom">
-                    <span>当月销售额：¥{{typeFalse?'****':statisticsData.stlAmountM}}元</span>
+                    <span>当月线上收款金额：¥{{typeFalse?'****':statisticsData.stlAmountM}}元</span>
                 </div>
                 <div class="position" v-if="saberUserInfo.role_name.indexOf('业务员') == -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
@@ -64,7 +64,7 @@
                     </div>
                 </div>
                 <div style="color: #f09d68" class="statisticsBottom">
-                    <span>当月销售额：¥{{typeFalse?'****':statisticsData.profitM}}元</span>
+                    <span>当月利润：¥{{typeFalse?'****':statisticsData.profitM}}元</span>
                 </div>
                 <div class="position" v-if="saberUserInfo.role_name.indexOf('业务员') == -1" @click="typeFalse = !typeFalse">
                     <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
@@ -147,6 +147,7 @@
                             :default-time="['00:00:00', '23:59:59']"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             @change="query(0)"
+                            :clearable="false"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期">
                         </el-date-picker>
@@ -181,6 +182,9 @@
                             align="center"
                             show-overflow-tooltip
                             label="订单日期">
+                            <template slot-scope="{row}">
+                                <span>{{row.date.slice(0,10)}}</span>
+                            </template>
                         </el-table-column>
                         <el-table-column
                             prop="status"