付费申请 组件

src/components/finance/config/option.json

@@ -9,7 +9,8 @@
   "searchMenuPosition": "right",
   "searchMenuSpan": 18,
   "tree": true,
-  "selection": true,
+  "refreshBtn": false,
+  "selection": false,
   "addBtn": false,
   "viewBtn": false,
   "editBtn": false,
@@ -19,85 +20,133 @@
   "column": [
     {
       "label": "合同号",
-      "prop": "accSysNo",
+      "prop": "srcOrderno",
+      "overHidden": true,
       "index": 1,
-      "cell": true,
-      "width": 220
-    },
-    {
-      "label": "合同日期",
-      "prop": "accDate",
-      "index": 2,
-      "cell": true,
-      "width": 220
+      "width": 150
     },
     {
       "label": "客户名称",
       "prop": "corpId",
+      "overHidden": true,
       "index": 3,
-      "cell": true,
-      "width": 220
+      "width": 180,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "费用名称",
       "prop": "costType",
+      "overHidden": true,
       "index": 4,
-      "cell": true,
-      "width": 220
+      "width": 180,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
-      "label": "单价",
-      "prop": "price",
+      "label": "合同日期",
+      "prop": "accDate",
+      "type": "date",
+      "overHidden": true,
       "index": 5,
       "cell": true,
-      "width": 120
+      "width": 150,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "提单号",
+      "prop": "billNo",
+      "overHidden": true,
+      "index": 5,
+      "width": 150
     },
     {
-      "label": "数量",
-      "prop": "quantity",
-      "value": 1,
+      "label": "金额",
+      "prop": "amount",
+      "overHidden": true,
       "index": 6,
       "cell": true,
-      "width": 150
+      "width": 120,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
-      "label": "计价单次",
-      "prop": "unit",
+      "label": "单价",
+      "prop": "price",
+      "overHidden": true,
       "index": 7,
       "cell": true,
       "width": 120
     },
     {
-      "label": "金额",
-      "prop": "amount",
+      "label": "计价单位",
+      "prop": "unit",
+      "overHidden": true,
       "index": 8,
-      "cell": true,
       "width": 120
     },
     {
       "label": "币别",
       "prop": "currency",
+      "overHidden": true,
       "index": 9,
-      "cell": true,
-      "width": 120
+      "width": 120,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "汇率",
       "prop": "exchangeRate",
+      "overHidden": true,
       "index": 10,
       "cell": true,
-      "width": 120
+      "width": 120,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "税率",
       "prop": "taxRate",
+      "overHidden": true,
       "index": 11,
-      "cell": true,
+      "value": 0,
       "width": 120
     },
     {
       "label": "备注",
       "prop": "remarks",
+      "overHidden": true,
       "index": 12,
       "cell": true,
       "width": 150

src/components/finance/financialAccount.vue

@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <avue-crud
+      ref="crud"
+      :data="data"
+      :option="option"
+      :table-loading="loading"
+      @row-update="rowUpdate"
+      @row-del="rowDel"
+      @saveColumn="saveColumn"
+      @resetColumn="resetColumn"
+    >
+      <template slot="menuLeft" slot-scope="{size}">
+        <el-button type="primary"
+                   icon="el-icon-plus"
+                   size="small"
+                   :loading="submitButton"
+                   @click="entering"
+        >录入
+        </el-button>
+      </template>
+      <template slot-scope="{row,index}" slot="menu">
+<!--        <el-button-->
+<!--          type="text"-->
+<!--          size="small"-->
+<!--          icon="el-icon-edit"-->
+<!--          @click="rowCell(row,index)"-->
+<!--        >{{ row.$cellEdit ? '修改完成' : '修改' }}-->
+<!--        </el-button>-->
+        <el-button
+          type="text"
+          icon="el-icon-delete"
+          size="small"
+          @click="rowDel(row,index)"
+        >删除
+        </el-button>
+      </template>
+      <template slot-scope="{row,index}" slot="corpId">
+        <span v-if="row.$cellEdit" class="required_fields" style="float: left;line-height: 32px">*</span>
+        <crop-select
+          v-if="row.$cellEdit"
+          v-model="corpId"
+          corpType="KG"
+          style="width: 100%"
+        ></crop-select>
+      </template>
+      <template slot-scope="{row,index}" slot="costType">
+        <span v-if="row.$cellEdit" class="required_fields">*</span>
+        <breakdown-select
+          v-if="row.$cellEdit"
+          v-model="row.costType"
+          style="width: 90%"
+          :configuration="configuration">
+        </breakdown-select>
+        <span v-else>{{ row.costType }}</span>
+      </template>
+      <template slot-scope="{row,index}" slot="billNo">
+        <el-select placeholder="请选择"
+                   v-if="row.$cellEdit"
+                   v-model="row.billNo"
+                   size="small"
+                   filterable
+                   allow-create
+                   default-first-option
+                   clearable>
+          <el-option
+            v-for="item in row.billNoList"
+            :key="item"
+            :label="item"
+            :value="item"
+          ></el-option>
+        </el-select>
+        <span v-else>{{ row.billNo }}</span>
+      </template>
+      <template slot-scope="{row,index}" slot="taxRate">
+        <el-input
+          v-model="row.taxRate"
+          v-if="row.$cellEdit"
+          size="small"
+          oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
+          autocomplete="off"
+        >
+          <i slot="suffix" style="margin-right: 10px;top:6px">%</i>
+        </el-input>
+        <span v-else>{{ row.taxRate }}</span>
+      </template>
+      <template slot-scope="{row,index}" slot="currency">
+        <span v-if="row.$cellEdit" class="required_fields">*</span>
+        <el-select v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择" style="width: 90%" @change="currencyChange(row)" clearable filterable>
+          <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
+        </el-select>
+        <span v-else>{{ row.currency }}</span>
+      </template>
+      <template slot-scope="{row,index}" slot="unit">
+        <span v-if="row.$cellEdit" class="required_fields">*</span>
+        <el-select  v-if="row.$cellEdit" v-model="row.unit" size="small" style="width: 90%" placeholder="请选择" clearable filterable>
+          <el-option v-for="(item,index) in unitDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
+        </el-select>
+        <span v-else>{{ row.unit }}</span>
+      </template>
+    </avue-crud>
+    <div class="dialogButton">
+      <el-button size="small" :loading="submitButton" @click="$emit('choceFun')">取消</el-button>
+      <el-button type="primary" size="small" :loading="submitButton" @click="submit()">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {applyLoan, paymentApply} from "@/api/financialManagement/paymentRequest";
+  import option from "./config/option.json"
+  export default {
+    name: "financialAccount",
+    props: {
+      billType: {
+        type: String
+      },
+      billData: {
+        type: Object
+      },
+      choceFun: {
+        type: Function
+      },
+      arrList: {
+        type: Array,
+        default: []
+      },
+    },
+    data(){
+      return {
+        data: [],
+        corpId:'',
+        option:option,
+        loading:false,
+        submitButton:false,
+        currencyDic:[],
+        unitDic:[],
+        configuration: {
+          multipleChoices: false,
+          multiple: false,
+          disabled: true,
+          searchShow: true,
+          collapseTags: false,
+          placeholder: '请点击右边按钮选择',
+          dicData: []
+        },
+      }
+    },
+    created() {
+      //币别
+      this.getWorkDicts("currency").then(res => {
+        this.currencyDic = res.data.data
+      })
+      this.getWorkDicts("unit").then(res => {
+        this.unitDic = res.data.data
+      })
+    },
+    mounted() {
+      this.init()
+    },
+    watch:{
+
+    },
+    methods:{
+      init(){
+        if(this.arrList.length === 0){
+          this.corpId = this.billData.corpId
+          this.$refs.crud.rowCellAdd(this.billData);
+        }else{
+          this.billData = this.arrList[0]
+          this.corpId = this.arrList[0].corpId
+          this.arrList.forEach(item=>{
+            this.$refs.crud.rowCellAdd(item);
+          })
+        }
+
+        //删除 提单号
+        if(this.billData.optionType !== "JK"){
+          this.option.column.forEach(item =>{
+            if(item.prop === "billNo"){
+              item.hide = true
+            }else{
+              item.hide = false
+            }
+          })
+        }
+      },
+      currencyChange(row){
+        this.currencyDic.forEach(item =>{
+          if(item.dictValue === row.currency){
+            row.exchangeRate = item.remark
+          }
+        })
+      },
+      rowCell(row,index){
+        this.$refs.crud.rowCell(row, index)
+      },
+      rowDel(row,index){
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            this.data.splice(index, 1);
+         })
+      },
+      rowUpdate(row, index, done, loading) {
+        done(row);
+      },
+      entering(){
+        if(this.data.length !== 0){
+          //取第一条数据的 合同号 以及客户
+          let params = {
+            ...this.billData,
+            srcOrderno:this.data[0].srcOrderno,
+            corpId:this.data[0].corpId
+          }
+          this.$refs.crud.rowCellAdd(params);
+        }else{
+          this.$refs.crud.rowCellAdd(this.billData);
+        }
+      },
+      submit(){
+        for(let i = 0;i<this.data.length;i++){
+          if (this.corpId === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的客户`);
+          }
+          if (this.data[i].costType === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的费用名称`);
+          }
+          if (this.data[i].accDate === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的合同日期`);
+          }
+          if (this.data[i].amount === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的金额`);
+          }
+          if (this.data[i].currency === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的币别`);
+          }
+          if (this.data[i].exchangeRate === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的汇率`);
+          }
+          if (this.data[i].taxRate === (null || "")) {
+            return this.$message.error(`请输入第${i + 1}行的税率`);
+          }
+        }
+
+        this.submitButton = true
+        const itemsList = this.data.map(item => {
+          item.corpId = this.corpId;
+          item.tradeType = this.billData.optionType
+          item.srcType = 1
+          return item
+        })
+        const params = {
+          billType : this.billType,
+          DC : this.billData.itemType === "采购"?"C":"D",     //账单明细会根据D C区分采购 销售搜索
+          itemsList: itemsList
+        }
+        // 采购申请货款   销售申请退款 都会走申请 走审核   => 付款申请
+        if(this.billType === "申请"){
+          applyLoan(params).then(res =>{
+            if(res.data.success){
+              this.$message.success("操作成功!")
+              this.$emit("choceFun");
+              //跳转付款申请页面
+              if(this.$store.getters.pqStatus){
+                this.$alert("无法自动跳,因为付费申请页面已存在!", "温馨提示", {
+                  confirmButtonText: "确定",
+                  type: 'warning',
+                  callback: action => {
+                  }
+                });
+              }else{
+                //关闭一下存在的列表页  跳转
+                this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
+                this.$router.push({
+                  path: "/financialManagement/paymentRequest/index",
+                  query: {params: res.data.data.id},
+                });
+              }
+            }
+          }).finally(()=>{
+            this.submitButton = false
+          })
+        }
+        //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
+        if(this.billType === "收费"){
+          paymentApply(params).then(res=>{
+            if(res.data.success){
+              this.$message.success("操作成功!")
+              this.$emit("choceFun");
+            }
+          }).finally(()=>{
+            this.submitButton = false
+          })
+        }
+      },
+      saveColumn(){
+
+      },
+      resetColumn(){
+
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .required_fields{
+    color: #F56C6C;
+    display:inline-block;
+    width: 7%
+  }
+</style>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -471,6 +471,25 @@
     </el-dialog>
 
     <el-dialog
+      append-to-body
+      title="账单"
+      class="el-dialogDeep"
+      :visible.sync="financialAccountDialog"
+      width="70%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
+      <financial-account
+        :billType="billType"
+        :billData="billData"
+        @choceFun="choceFun"
+      >
+      </financial-account>
+    </el-dialog>
+
+    <el-dialog
       title="申请记录"
       append-to-body
       class="el-dialogDeep"
@@ -522,6 +541,7 @@ import {
   micrometerFormat,
   IntegerFormat
 } from "@/util/validate";
+import financialAccount from "../../../components/finance/financialAccount";
 
 export default {
   name: "detailsPage",
@@ -537,6 +557,7 @@ export default {
     ApplyPayment,
     billApplication,
     feeInfo,
+    financialAccount
   },
   data() {
     return {
@@ -559,6 +580,7 @@ export default {
       loadingCost: false,
       choiceData: false,
       commodityData: false,
+      financialAccountDialog:false,
       dataCost: [],
       choiceIndex: '',
       dialogCost: false,
@@ -1488,13 +1510,13 @@ export default {
       //   })
       // }else{
         this.beforeBillData(true,type);
-        this.applyPaymentDialog = true;
+        this.financialAccountDialog = true;
       // }
 
     },
     //关闭账单
     choceFun(){
-      this.applyPaymentDialog  = false
+      this.financialAccountDialog  = false
     },
     //返回列表
     backToList() {

src/views/businessManagement/purchaseOrder/index.vue

@@ -97,6 +97,26 @@
       >
       </apply-payment>
     </el-dialog>
+    <el-dialog
+      append-to-body
+      title="账单"
+      class="el-dialogDeep"
+      :visible.sync="financialAccountDialog"
+      width="70%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
+      <financial-account
+        v-if="financialAccountDialog"
+        :billType="billType"
+        :billData="billData"
+        :arrList="applyPaymentList"
+        @choceFun="choceFun"
+      >
+      </financial-account>
+    </el-dialog>
   </div>
 </template>
 
@@ -106,6 +126,7 @@ import {customerList, deleteDetails} from "@/api/basicData/purchaseOrder"
 import detailPage from "./detailsPageEdit";
 import { defaultDate } from "@/util/date";
 import ApplyPayment from "@/components/finance/applyPayment";
+import financialAccount from "../../../components/finance/financialAccount";
 
 export default {
   name: "customerInformation",
@@ -117,6 +138,7 @@ export default {
   components: {
     detailPage,
     ApplyPayment,
+    financialAccount
   },
   data() {
     return {
@@ -150,6 +172,7 @@ export default {
       billType:"申请",  //账单类型
       billData:{},     //账单需要数据
       applyPaymentDialog:false,//生成账单组件
+      financialAccountDialog:false,
       applyPaymentList: [],
     }
   },
@@ -393,26 +416,24 @@ export default {
       let a = []
       this.selection.forEach(item => {
         let form = {
-          form: {
-            srcOrderno:item.orderNo,
-            itemType:"采购",
-            optionType:"GN",
-            corpsName:item.strCorpName,
-            corpId:item.corpId,
-            srcParentId: item.id,
-            currency: 'CNY',
-            exchangeRate: '1',
-            taxRate: '0',
-            accDate: item.businesDate,
-            srcType: 1,
-            tradeType: 'GN'
-          }
+          srcOrderno:item.orderNo,
+          itemType:"采购",
+          optionType:"GN",
+          corpsName:item.strCorpName,
+          corpId:item.corpId,
+          srcParentId: item.id,
+          currency: 'CNY',
+          exchangeRate: '1',
+          taxRate: '0',
+          accDate: item.businesDate,
+          srcType: 1,
+          tradeType: 'GN'
         }
         a.push(form)
       })
       this.applyPaymentList = [...a]
       // this.beforeBillData(true);
-      this.applyPaymentDialog = true;
+      this.financialAccountDialog = true;
     },
     beforeBillData(type) {
       if(type){ //申请货款
@@ -421,7 +442,7 @@ export default {
     },
     //关闭账单
     choceFun(){
-      this.applyPaymentDialog  = false
+      this.financialAccountDialog  = false
     },
   }
 }

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -676,6 +676,25 @@
     ></report-dialog>
 
     <el-dialog
+      append-to-body
+      title="账单"
+      class="el-dialogDeep"
+      :visible.sync="financialAccountDialog"
+      width="70%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
+      <financial-account
+        :billType="billType"
+        :billData="billData"
+        @choceFun="choceFun"
+      >
+      </financial-account>
+    </el-dialog>
+
+    <el-dialog
       title="申请记录"
       append-to-body
       class="el-dialogDeep"
@@ -748,6 +767,7 @@ import {
   micrometerFormat,
   IntegerFormat
 } from "@/util/validate";
+import financialAccount from "../../../components/finance/financialAccount";
 
 export default {
   name: "detailsPage",
@@ -762,6 +782,7 @@ export default {
     reportDialog,
     feeInfo,
     billApplication,
+    financialAccount
   },
   data() {
     return {
@@ -773,6 +794,7 @@ export default {
       billType:"收费",  //账单类型
       billData:{},     //账单需要数据
       applySettlementDialog:false,//生成账单组件
+      financialAccountDialog:false,
       configuration: {
         multipleChoices: false,
         multiple: false,
@@ -1940,7 +1962,7 @@ export default {
         })
       } else {
         this.beforeBillData(true,type)
-        this.applySettlementDialog = true;
+        this.financialAccountDialog = true;
       }
     },
     //生成账单 拿到主表信息
@@ -1966,7 +1988,7 @@ export default {
     },
     //关闭账单
     choceFun(){
-      this.applySettlementDialog  = false
+      this.financialAccountDialog  = false
     },
     //商品选中触发
     productSelection(selection) {

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -65,7 +65,6 @@
         </avue-form>
       </basic-container>
       <containerTitle title="明细列表"></containerTitle>
-      {{dataList}}
       <basic-container>
         <avue-crud :option="itemsOption"
                    :data="dataList"

src/views/purchase/contract/detailsPage.vue

@@ -347,6 +347,24 @@
       >
       </apply-payment>
     </el-dialog>
+    <el-dialog
+      append-to-body
+      title="账单"
+      class="el-dialogDeep"
+      :visible.sync="financialAccountDialog"
+      width="70%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :close-on-press-escape="false"
+      v-dialog-drag
+    >
+      <financial-account
+        :billType="billType"
+        :billData="billData"
+        @choceFun="choceFun"
+      >
+      </financial-account>
+    </el-dialog>
   </div>
 </template>
 
@@ -362,6 +380,7 @@ import  billApplication from "@/components/bill/billApplication";
 import { corpsattn } from "@/api/basicData/configuration"
 import { contrastObj,contrastList } from "@/util/contrastData";
 import ApplyPayment from "../../../components/finance/applyPayment";
+import financialAccount from "../../../components/finance/financialAccount";
 
 export default {
   name: "detailsPage",
@@ -380,6 +399,7 @@ export default {
   },
   components: {
     ApplyPayment,
+    financialAccount,
     feeInfo,
     uploadFile,
     billApplication
@@ -395,6 +415,7 @@ export default {
       buttonLoading:false,
       applyPaymentDialog:false,
       applicationDialog:false,
+      financialAccountDialog:false,
       commodityData: false,
       takeDisabled:false, //收货状态
       viewDisabled:false,//查看状态
@@ -974,7 +995,7 @@ export default {
     applyPayment(type){
       if(this.verificationData()){
         this.beforeBillData(true,type);
-        this.applyPaymentDialog = true;
+        this.financialAccountDialog = true;
       }
     },
     //新增商品明细保存触发
@@ -1015,7 +1036,7 @@ export default {
     },
     //关闭账单
     choceFun(){
-      this.applyPaymentDialog  = false
+      this.financialAccountDialog  = false
     },
     //打开申请记录
     openApplicationDialog(){

src/views/workManagement/main-items/detailsPage.vue

@@ -6,14 +6,14 @@
                    @click="backToList">返回列表
         </el-button>
         <div class="upper_right_button">
-          <el-button type="success"
-                     size="small"
-                     class="el-button--small-yh "
-                     :loading="buttonLoading"
-                     :disabled="!form.id || viewDisabled"
-                     @click.stop="mainCheck">
-            请核
-          </el-button>
+<!--          <el-button type="success"-->
+<!--                     size="small"-->
+<!--                     class="el-button&#45;&#45;small-yh "-->
+<!--                     :loading="buttonLoading"-->
+<!--                     :disabled="!form.id || viewDisabled"-->
+<!--                     @click.stop="mainCheck">-->
+<!--            请核-->
+<!--          </el-button>-->
 
 <!--          <el-dropdown style="padding: 0 8px;line-height: 0">-->
 <!--            <el-button-->

src/views/workManagement/main-items/list.vue

@@ -10,6 +10,7 @@
       :table-loading="loading"
       :summary-method="summaryMethod"
       @row-del="rowDel"
+      @size-change="sizeChange"
       @search-change="searchChange"
       @current-change="currentChange"
       @refresh-change="refreshChange"
@@ -24,7 +25,7 @@
         ></select-component>
       </template>
       <template slot-scope="scope" slot="corpId">
-        {{ scope.row.corpNames }}
+        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row,scope.index)">{{ scope.row.corpNames }}</span>
       </template>
       <template slot="corpAttnSearch">
         <el-select v-model="search.corpAttn"
@@ -116,7 +117,8 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 10
+        pageSize: 10,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500,1000]
       }
     };
   },
@@ -226,6 +228,10 @@ export default {
       this.getList(this.page, params);
       done();
     },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
     currentChange(val) {
       this.page.currentPage = val;
       this.getList(this.page);

src/views/workManagement/performanceAnalysis/config/clientList.json

@@ -27,6 +27,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "countUserName",
+      "type": "sum"
+    },
+    {
       "name": "jan",
       "type": "sum"
     },
@@ -81,43 +85,6 @@
   ],
   "column": [
     {
-      "label": "类型",
-      "prop": "flag",
-      "searchValue": "2",
-      "search": true,
-      "hide": true
-    },
-    {
-      "label": "年份",
-      "prop": "year",
-      "search": true,
-      "hide": true,
-      "type": "select",
-      "searchValue": "2021",
-      "dicData": [
-        {
-        "label": "2018",
-        "value": 2018
-      },
-        {
-        "label": "2019",
-        "value": 2019
-      },
-        {
-          "label": "2020",
-          "value": 2020
-        },
-        {
-          "label": "2021",
-          "value": 2021
-        },
-        {
-          "label": "2022",
-          "value": 2022
-        }
-      ]
-    },
-    {
       "label": "客户名称",
       "prop": "corpNames",
       "search": true,
@@ -222,6 +189,45 @@
       "overHidden": true,
       "width": 90,
       "index": 15
+    },
+    {
+      "label": "类型",
+      "prop": "flag",
+      "searchValue": "2",
+      "search": true,
+      "hide": true,
+      "index": 16
+    },
+    {
+      "label": "年份",
+      "prop": "year",
+      "search": true,
+      "hide": true,
+      "index": 17,
+      "type": "select",
+      "searchValue": "2021",
+      "dicData": [
+        {
+          "label": "2018",
+          "value": 2018
+        },
+        {
+          "label": "2019",
+          "value": 2019
+        },
+        {
+          "label": "2020",
+          "value": 2020
+        },
+        {
+          "label": "2021",
+          "value": 2021
+        },
+        {
+          "label": "2022",
+          "value": 2022
+        }
+      ]
     }
   ]
 }

src/views/workManagement/performanceAnalysis/config/mainList.json

@@ -27,6 +27,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "countCorp",
+      "type": "sum"
+    },
+    {
       "name": "jan",
       "type": "sum"
     },

src/views/workManagement/performanceAnalysis/index.vue

@@ -92,9 +92,10 @@
           label: '客户'
         }],
         page: {
-          pageSize: 10,
-          pagerCount: 5,
+          currentPage: 1,
           total: 0,
+          pageSize: 10,
+          pageSizes: [10, 50, 100, 200, 300, 400, 500,1000]
         },
       }
     },
@@ -161,8 +162,9 @@
       selectionChange() {
         console.log('1')
       },
-      sizeChange() {
-        console.log('1')
+      sizeChange(val) {
+        this.page.currentPage = 1;
+        this.page.pageSize = val;
       },
       currentChange(val) {
         this.page.currentPage = val

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -53,6 +53,7 @@
       "prop": "status",
       "type": "select",
       "index": 1,
+      "width": 80,
       "search": true,
       "overHidden": true,
       "dicData": [

src/views/workManagement/receipt/statisticalList.vue

@@ -34,7 +34,7 @@
         ></select-component>
       </template>
       <template slot-scope="scope" slot="cornId">
-        {{ scope.row.cornName }}
+        <span style="color: #409EFF;cursor: pointer" @click.stop="check(scope.row,scope.index)">{{ scope.row.cornName }}</span>
       </template>
       <template slot-scope="scope" slot="deptid">
         {{ scope.row.deptName }}
@@ -88,7 +88,7 @@
         form: {},
         search:{},
         exportLoading:false,
-        option: {},
+        option: option,
         parentId:0,
         dataList: [],
         options:[],
@@ -113,7 +113,7 @@
     },
     async created() {
 
-      this.option = await this.getColumnData(this.getColumnName(57), option);
+      // this.option = await this.getColumnData(this.getColumnName(57), option);
 
       getUserList().then(res=>{
         res.data.data.map((item,index)=>{