Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/bill/billApplication.vue

@@ -27,7 +27,7 @@
         ></breakdown-select>
       </template>
     </avue-crud>
-    <div style="padding: 10px;display: flex;justify-content: flex-end;">
+    <div class="dialogButton">
        <span slot="footer" class="dialog-footer" >
            <el-button @click="$emit('choceApplication')">关闭</el-button>
        </span>

src/components/bill/billDetailList.vue

@@ -18,7 +18,7 @@
         ></breakdown-select>
       </template>
     </avue-crud>
-    <div style="padding: 10px;display: flex;justify-content: flex-end;">
+    <div class="dialogButton">
        <span slot="footer" class="dialog-footer" >
            <el-button @click="$emit('closeFun')">取 消</el-button>
            <el-button type="primary" @click="importProMent" :disabled="selectList.length == 0">导入</el-button>

src/components/check/check.vue

@@ -2,7 +2,7 @@
   <div>
     <avue-form class="trading-form" :option="option" ref="form" v-model="form">
     </avue-form>
-    <div style="padding: 10px;display: flex;justify-content: flex-end;">
+    <div class="dialogButton">
       <el-button size="small" :loading="buttonLoading" @click="$emit('choceCheckFun')">关闭</el-button>
       <el-button type="warning" :loading="buttonLoading" size="small" @click="submit(2)">审批驳回</el-button>
       <el-button type="primary" :loading="buttonLoading" size="small" @click="submit(1)">审批通过</el-button>
@@ -112,7 +112,7 @@
             })
           }else{
             //单个
-            this.buttonLoading = true
+            // this.buttonLoading = true
             this.checkData.auditName = this.form.auditName
             this.checkData.auditMsg = this.form.auditMsg
             this.checkData.auditOpTime = this.form.auditOpTime
@@ -126,7 +126,12 @@
                 let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
                 this.$store.commit('DEL_TAG', tag)
                 this.$store.commit("PQ_OUT_DETAIL");
-                this.$router.back(-1)
+                let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
+                this.$store.commit('DEL_TAG', tag1)
+                this.$router.push({
+                  path: "/approveData/index",
+                  query: {check:'refresh'},
+                });
               }
             }).finally(()=>{
               this.buttonLoading = false

src/components/check/checkSchedule.vue

@@ -32,7 +32,7 @@
           </template>
         </el-step>
       </el-steps>
-      <div style="margin-left: 80%;padding: 10px">
+      <div class="dialogButton">
         <el-button size="small" @click="$emit('choceScheduleFun')">关闭</el-button>
       </div>
     </div>

src/components/fee-info/config/feeList.json

@@ -13,6 +13,9 @@
   "searchMenuSpan": 6,
   "tree": true,
   "selection": true,
+  "searchSpan": 8,
+  "searchIcon": true,
+  "searchIndex": 2,
   "viewBtn": true,
   "menuWidth": 300,
   "column": [
@@ -34,7 +37,7 @@
       "label": "费用名称",
       "prop": "cname",
       "search": true,
-      "index": 2,   
+      "index": 2,
       "rules": [
         {
           "required": true,
@@ -48,7 +51,7 @@
       "label": "币别",
       "prop": "fcyno",
       "search": true,
-      "index": 3,     
+      "index": 3,
       "rules": [
         {
           "required": false,

src/components/fee-info/main.vue

@@ -35,13 +35,6 @@
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 1"
           >生成账单</el-button>
-    <!--      <el-button
-            type="info"
-            size="small"
-            @click.stop="rowAdd"
-            :disabled="disabled || selectionList.length == 0"
-            v-if="selectTab === 1"
-          >查看生成记录</el-button>-->
           <el-button
             type="warning"
             size="small"
@@ -50,13 +43,6 @@
             :disabled="disabled || selectionList.length == 0"
             v-if="selectTab === 2"
           >申请付费</el-button>
-     <!--     <el-button
-            type="info"
-            size="small"
-            @click.stop="rowAdd"
-            :disabled="disabled || selectionList.length == 0"
-            v-if="selectTab === 2"
-          >查看申请记录</el-button>-->
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button
@@ -84,7 +70,7 @@
             v-model="row.corpId"
             :cropIndex="index"
             @getCorpData="getCorpData"
-            corpType="KH"
+            corpType="KG"
           ></crop-select>
           <span v-else>{{ row.corpName }}</span>
         </template>
@@ -104,6 +90,7 @@
           <el-input
             v-if="row.$cellEdit"
             v-model="row.price"
+            placeholder="请输入"
             size="small"
             oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             @input="countChange(row)"
@@ -115,6 +102,7 @@
             v-if="row.$cellEdit"
             v-model="row.quantity"
             size="small"
+            placeholder="请输入"
             oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
             @input="countChange(row)"
           ></el-input>
@@ -141,7 +129,7 @@
             filterable
             allow-create
             default-first-option
-            placeholder="请输入"
+            placeholder="请选择"
             size="small"
             @change="currencyChange(row)"
           >
@@ -160,7 +148,7 @@
             v-if="row.$cellEdit"
             v-model="row.unit"
             filterable
-            placeholder="请输入"
+            placeholder="请选择"
             size="small"
           >
             <el-option
@@ -217,7 +205,7 @@
           </avue-crud>
         </el-col>
       </el-row>
-      <span slot="footer" class="dialog-footer">
+      <div class="dialogButton">
         <el-button @click="feeDialog = false">取 消</el-button>
         <el-button
           type="primary"
@@ -226,7 +214,7 @@
         >
           导入
         </el-button>
-      </span>
+      </div>
     </el-dialog>
     <crop-dialog ref="cropDialog" @importCorp="importCorp"></crop-dialog>
   </div>
@@ -357,6 +345,22 @@ export default {
     cropDialog,
     ApplyPayment
   },
+  watch: {
+    orderFeesList: function(rows) {
+      this.allData = rows ? rows : [];
+      if(this.allData.length !=0){
+        this.data_one=this.allData.filter(item=>item.feesType === 1)  //应收
+        this.data_two=this.allData.filter(item=>item.feesType === 2)  //应付
+        if(this.isUpdata){
+          if(this.selectTab == 1){
+            this.feeData = this.data_one
+          }else{
+            this.feeData = this.data_two
+          }
+        }
+      }
+    },
+  },
   methods: {
     //选择费用
     selectValue(value,row){
@@ -488,7 +492,8 @@ export default {
     },
     //新增
     rowAdd() {
-      this.$refs.cropDialog.init();
+      this.$refs.feeCrud.rowCellAdd();
+      // this.$refs.cropDialog.init();
     },
     onLoad(page) {
       this.loading = true;
@@ -593,6 +598,9 @@ export default {
             if(this.selectionList[i].corpId != this.selectionList[0].corpId){
               return this.$message.error('批量操作结算单位必须一致')
             }
+            if(this.selectionList[i].isCheck == 1){
+              return this.$message.error('批量操作结算单位必须一致b')
+            }
           }
 
           this.isUpdata = false
@@ -622,6 +630,22 @@ export default {
               applyLoan(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
+                  //跳转付费申请页面
+                  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.isUpdata = true
@@ -685,22 +709,6 @@ export default {
       }
     }
   },
-  watch: {
-    orderFeesList: function(rows) {
-      this.allData = rows ? rows : [];
-      if(this.allData.length !=0){
-        this.data_one=this.allData.filter(item=>item.feesType === 1)  //应收
-        this.data_two=this.allData.filter(item=>item.feesType === 2)  //应付
-        if(this.isUpdata){
-          if(this.selectTab == 1){
-            this.feeData = this.data_one
-          }else{
-            this.feeData = this.data_two
-          }
-        }
-      }
-    },
-  }
 };
 </script>
 

src/components/procurement/market.vue

@@ -12,7 +12,7 @@
                @on-load="onLoad">
       <template slot-scope="scope"></template>
     </avue-crud>
-    <div  style="padding: 10px;display: flex;justify-content: flex-end;">
+    <div  class="dialogButton">
        <span slot="footer" class="dialog-footer">
            <el-button @click="closeDialog">取 消</el-button>
            <el-button type="primary" @click="importMarket" :disabled="selectMarketList.length == 0">导入</el-button>

src/components/procurement/purchase.vue

@@ -11,7 +11,7 @@
                :page.sync="page"
                @on-load="onLoad">
     </avue-crud>
-    <div style="padding: 10px;display: flex;justify-content: flex-end;">
+    <div class="dialogButton">
        <span slot="footer" class="dialog-footer" >
            <el-button @click="close">取 消</el-button>
            <el-button type="primary" @click="importProMent" :disabled="selectPromentList.length == 0">导入</el-button>

src/router/views/index.js

@@ -552,7 +552,7 @@ export default [{
       }
     ]
   },
-  // 付款申请
+  // 付费申请
   {
     path: '/financialManagement/paymentRequest/index',
     component: Layout,

src/styles/variables.scss

@@ -74,4 +74,9 @@ p{
 .el-form-item__label {
   font-size: 12px !important;
   // font-weight: 600;
-}
+}
+.dialogButton{
+  padding: 10px;
+  display: flex;
+  justify-content: flex-end;
+}

src/views/approveData/index.vue

@@ -145,6 +145,11 @@ let previousRouterName = ""
     mounted() {
       // option.height = window.innerHeight - 200 ;
     },
+    activated() {
+      if(this.$route.query.check === 'refresh'){
+        this.onLoad(this.page,this.search)
+      }
+    },
     methods: {
       batchCheck(){
         for(let i=0;i<this.selectionList.length;i++){

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -352,7 +352,7 @@
               <el-button type="warning"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="selection.length < 1 || detailData.seeDisabled || form.status != 3"
+                         :disabled="selection.length < 1 || detailData.seeDisabled"
                          @click="getShipmentD"
                          v-show="goodsActives == 'goods'">生成客户确认
               </el-button>

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -954,6 +954,9 @@ export default {
         this.upLoadData = data.deliveryFilesList
         this.oldUpLoadData = this.deepClone(data.deliveryFilesList)
       }
+      if(this.detailData.status === 'copy'){
+        this.copyData()
+      }
     },
     //验证
     verificationData(){
@@ -996,7 +999,6 @@ export default {
         delete  this.form.id  //删除id
         delete  this.form.deliveryStatus
         this.$set(this.form,"sysNo","")//系统编号
-        this.$set(this.form,"orderNo","")//合同号
 
         this.contactsData.forEach(item =>{
           delete item.id  //删除id
@@ -1009,7 +1011,7 @@ export default {
         this.oldForm = {}
         this.oldContactsData = []
         this.oldUpLoadData = []
-        this.$message.success("操作成功!")
+        this.$message.success("复制成功!")
       }
     },
     //返回列表

src/views/importTrade/invoice/index.vue

@@ -8,10 +8,8 @@
                :page.sync="page"
                :search.sync="search"
                @row-del="rowDel"
-               @row-update="rowUpdate"
                :before-open="beforeOpen"
                :before-close="beforeClose"
-               @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -35,15 +33,10 @@
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
-                   :disabled="true"
-                   @click.stop=""
+                   :disabled="selectionList.length != 1"
+                   @click.stop="copyBill"
         >复制单据
         </el-button>
-        <el-button size="small"
-                   type="info"
-                   @click.stop=""
-        >报表
-        </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button
@@ -99,6 +92,7 @@ export default {
       show:true,
       detailData:{},
       dataList: [],
+      selectionList:[],
       page: {
         pageSize: 10,
         pagerCount: 5,
@@ -173,42 +167,13 @@ export default {
         this.onLoad(this.page);
       });
     },
-    //修改时的修改按钮点击触发
-    rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    //新增修改时保存触发
-    rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
-    },
-    //查询全部
-    initData() {
-      customerList().then(res => {
-        console.log(this.form);
-        const column = this.findObject(this.option.column, "parentId");
-        column.dicData = res.data.data.records;
-      });
-    },
-    //新增子项触发
-    handleAdd(row) {
-      this.parentId = row.id;
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = row.id;
-      column.addDisabled = true;
-      this.$refs.crud.rowAdd();
+    copyBill(){
+      this.detailData = {
+        id: this.selectionList[0].id,
+        status: 'copy'
+      };
+      this.show = false;
+      this.$store.commit("GO_IN_DETAIL");
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
@@ -254,8 +219,8 @@ export default {
     searchReset() {
       console.log('1')
     },
-    selectionChange() {
-      console.log('1')
+    selectionChange(row) {
+      this.selectionList = row
     },
     currentChange(val) {
       this.page.currentPage = val

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -801,6 +801,9 @@ export default {
         this.upLoadData = data.deliveryFilesList
         this.oldUpLoadData = this.deepClone(data.deliveryFilesList)
       }
+      if(this.detailData.status === 'copy'){
+        this.copyData()
+      }
     },
     verificationData(){
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
@@ -842,7 +845,6 @@ export default {
         delete  this.form.id  //删除id
         delete  this.form.deliveryStatus
         this.$set(this.form,"sysNo","")//系统编号
-        this.$set(this.form,"orderNo","")//合同号
 
         this.contactsData.forEach(item =>{
           delete item.id  //删除id
@@ -855,7 +857,7 @@ export default {
         this.oldForm = {}
         this.oldContactsData = []
         this.oldUpLoadData = []
-        this.$message.success("操作成功!")
+        this.$message.success("复制成功!")
       }
     },
     //返回列表

src/views/importTrade/receipt/index.vue

@@ -8,10 +8,8 @@
                :page.sync="page"
                :search.sync="search"
                @row-del="rowDel"
-               @row-update="rowUpdate"
                :before-open="beforeOpen"
                :before-close="beforeClose"
-               @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -35,15 +33,10 @@
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
-                   :disabled="true"
-                   @click.stop=""
+                   :disabled="selectionList.length != 1"
+                   @click.stop="copyBill"
         >复制单据
         </el-button>
-        <el-button size="small"
-                   type="info"
-                   @click.stop=""
-        >报表
-        </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button
@@ -82,7 +75,6 @@
 
 <script>
 import option from "./config/mainList.json";
-import {customerList, typeSave, deleteDetails} from "@/api/basicData/configuration"
 import {selectReceiptList,
   removeReceiptList,} from "@/api/importTrade/receipt"
 import detailPage from "./detailsPageEdit.vue";
@@ -96,6 +88,7 @@ export default {
       show:true,
       loading:false,
       detailData:{},
+      selectionList:[],
       option: option,
       search: {},
       configuration:{
@@ -173,42 +166,13 @@ export default {
         this.onLoad(this.page);
       });
     },
-    //修改时的修改按钮点击触发
-    rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    //新增修改时保存触发
-    rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
-    },
-    //查询全部
-    initData() {
-      customerList().then(res => {
-        console.log(this.form);
-        const column = this.findObject(this.option.column, "parentId");
-        column.dicData = res.data.data.records;
-      });
-    },
-    //新增子项触发
-    handleAdd(row) {
-      this.parentId = row.id;
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = row.id;
-      column.addDisabled = true;
-      this.$refs.crud.rowAdd();
+    copyBill(){
+      this.detailData = {
+        id: this.selectionList[0].id,
+        status: 'copy'
+      };
+      this.show = false;
+      this.$store.commit("TAKE_IN_DETAIL");
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
@@ -254,8 +218,8 @@ export default {
     searchReset() {
       console.log('1')
     },
-    selectionChange() {
-      console.log('1')
+    selectionChange(row) {
+      this.selectionList = row
     },
     currentChange(val) {
       this.page.currentPage = val

src/views/purchase/contract/detailsPage.vue

@@ -967,6 +967,9 @@ export default {
         this.orderFilesList = form.orderFilesList
         this.oldFilesList = this.deepClone(form.orderFilesList)
       }
+      if(this.detailData.status === 'copy'){
+        this.copyData()
+      }
     },
     openDisabled(){
       this.viewDisabled = false
@@ -993,7 +996,9 @@ export default {
           this.$router.$avueRouter.closeTag('/importTrade/receipt/index');
           this.$router.push({
             path: "/importTrade/receipt/index",
-            query: {params: params},
+            query: {
+              params: params
+            },
           });
         }
       }
@@ -1153,7 +1158,7 @@ export default {
         this.oldContactsData = []
         this.oldFeesList = []
         this.oldFilesList = []
-        this.$message.success("操作成功!")
+        this.$message.success("复制成功!")
       }
     },
     backToList() {

src/views/purchase/contract/index.vue

@@ -9,10 +9,8 @@
                  :page.sync="page"
                  :search.sync="search"
                  @row-del="rowDel"
-                 @row-update="rowUpdate"
                  :before-open="beforeOpen"
                  :before-close="beforeClose"
-                 @row-save="rowSave"
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
@@ -45,15 +43,10 @@
         <template slot="menuLeft">
           <el-button size="small"
                      type="success"
-                     :disabled="true"
-                     @click.stop=""
+                     :disabled="selectionList.length != 1"
+                     @click.stop="copyBill"
           >复制单据
           </el-button>
-          <el-button size="small"
-                     type="info"
-                     @click.stop="openReport()"
-          >报表
-          </el-button>
         </template>
         <template slot-scope="scope" slot="menu">
           <el-button
@@ -107,6 +100,7 @@ export default {
       option: option,
       detailData:{},
       dataList: [],
+      selectionList:[],
       page: {
         pageSize: 10,
         pagerCount: 5,
@@ -171,41 +165,12 @@ export default {
         })
       })
     },
-    //修改时的修改按钮点击触发
-    rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    //新增修改时保存触发
-    rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
-    },
-    //查询全部
-    initData() {
-      customerList().then(res => {
-        const column = this.findObject(this.option.column, "parentId");
-        column.dicData = res.data.data.records;
-      });
-    },
-    //新增子项触发
-    handleAdd(row) {
-      this.parentId = row.id;
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = row.id;
-      column.addDisabled = true;
-      this.$refs.crud.rowAdd();
+    copyBill(){
+      this.detailData = {
+        id: this.selectionList[0].id,
+        status: 'copy'
+      };
+      this.show = false;
     },
     //查看跳转页面
     beforeOpenPage(row, status) {
@@ -241,7 +206,6 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
-      console.log(params)
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
       done()
@@ -249,8 +213,8 @@ export default {
     searchReset() {
       console.log('1')
     },
-    selectionChange() {
-      console.log('1')
+    selectionChange(row) {
+      this.selectionList = row
     },
     currentChange(val) {
       this.page.currentPage = val;

src/views/salesManagement/salesContract/detailsPage.vue

@@ -938,6 +938,7 @@ export default {
             id:this.form.id,
             orderItemIds:this.selection.map(i=>{return i.id})
           }
+          this.$router.$avueRouter.closeTag('/importTrade/invoice/index');
           this.$router.push({
             path: "/importTrade/invoice/index",
             query: {form: params},
@@ -1092,6 +1093,9 @@ export default {
         this.orderFilesList = data.orderFilesList
         this.oldFilesList = this.deepClone(data.orderFilesList)
       }
+      if(this.detailData.status === 'copy'){
+        this.copyData()
+      }
     },
     //验证数据
     verificationData(){
@@ -1161,7 +1165,7 @@ export default {
         this.oldInventoryData = []
         this.oldFeesList = []
         this.oldFilesList = []
-        this.$message.success("操作成功!")
+        this.$message.success("复制成功!")
       }
     },
     backToList() {

src/views/salesManagement/salesContract/index.vue

@@ -10,7 +10,6 @@
                @row-del="rowDel"
                :before-open="beforeOpen"
                :before-close="beforeClose"
-               @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -44,15 +43,10 @@
       <template slot="menuLeft">
         <el-button size="small"
                    type="success"
-                   :disabled="true"
-                   @click.stop=""
+                   :disabled="selectionList.length != 1"
+                   @click.stop="copyBill"
         >复制单据
         </el-button>
-        <el-button size="small"
-                   type="info"
-                   @click.stop=""
-        >报表
-        </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button
@@ -106,6 +100,7 @@ export default {
       dataList: [],
       loading:false,
       show:true,
+      selectionList:[],
       page: {
         pageSize: 10,
         pagerCount: 5,
@@ -168,20 +163,12 @@ export default {
         this.onLoad(this.page);
       });
     },
-    //新增修改时保存触发
-    rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        done()
-      })
-    },
-    //新增子项触发
-    handleAdd(row) {
-      this.parentId = row.id;
-      const column = this.findObject(this.option.column, "parentId");
-      column.value = row.id;
-      column.addDisabled = true;
-      this.$refs.crud.rowAdd();
+    copyBill(){
+      this.detailData = {
+        id: this.selectionList[0].id,
+        status: 'copy'
+      };
+      this.show = false;
     },
     //查看跳转页面
     beforeOpenPage(row, index) {
@@ -226,8 +213,8 @@ export default {
     searchReset() {
       console.log('1')
     },
-    selectionChange() {
-      console.log('1')
+    selectionChange(row) {
+      this.selectionList = row
     },
     currentChange(val) {
       this.page.currentPage = val;

src/views/statisticAnalysis/profit/config/mainList.json

@@ -22,6 +22,66 @@
   "addBtn":false,
   "menu": false,
   "headerAlign": "center",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "customDutyMoney",
+      "type": "sum"
+    },
+    {
+      "name": "gstMoney",
+      "type": "sum"
+    },
+    {
+      "name": "quotaMoney",
+      "type": "sum"
+    },
+    {
+      "name": "itemMoney",
+      "type": "sum"
+    },
+    {
+      "name": "unitPrice",
+      "type": "sum"
+    },
+    {
+      "name": "saleBillWeight",
+      "type": "sum"
+    },
+    {
+      "name": "price",
+      "type": "sum"
+    },
+    {
+      "name": "amount",
+      "type": "sum"
+    },
+    {
+      "name": "saleBillWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceAmount",
+      "type": "sum"
+    },
+    {
+      "name": "unitPrice",
+      "type": "sum"
+    },
+    {
+      "name": "costAmount",
+      "type": "sum"
+    },
+    {
+      "name": "deliverMoney",
+      "type": "sum"
+    },
+    {
+      "name": "profit",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/views/workManagement/performanceAnalysis/index.vue

@@ -83,7 +83,7 @@
         userNameOptions:[],
         flagOptions:[{
           value: '1',
-          label: '制单人'
+          label: '承做人'
         }, {
           value: '2',
           label: '客户'