进口细节调整

src/api/financialManagement/paymentRequest.js

@@ -60,6 +60,13 @@ export const modify = (data) => {
     data: data
   })
 }
+export const cancelModify = (data) => {
+  return request({
+    url: '/api/trade-finance/settlement/cancelModify',
+    method: 'post',
+    data: data
+  })
+}
 
 //结算新增修改
 export const saveOrEdit = (data) => {

src/components/fee-info/main.vue

@@ -7,6 +7,7 @@
         :data="feeData"
         :option="feeOption"
         @saveColumn="saveColumn"
+        @selection-change="selectionCrud"
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
       >
@@ -19,6 +20,10 @@
             :disabled="disabled"
             >新增</el-button
           >
+          <el-button-group>
+            <el-button type="receivableButton" :disabled="selectionCrudList.length ==0"  @click="receivable">应收</el-button>
+            <el-button type="copeWithButton" :disabled="selectionCrudList.length ==0"   @click="copeWith">应付</el-button>
+          </el-button-group>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button
@@ -222,8 +227,11 @@ export default {
       },
       treeDeptId: null,
       loading: false,
+      receivableButton:"primary",
+      copeWithButton:"",
       data: [],
       feeData: [],
+      selectionCrudList:[],
       selectionList: [],
       reData: null,
       currencyList: []
@@ -354,6 +362,10 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    //列表多选
+    selectionCrud(list){
+      this.selectionCrudList = list
+    },
     rePick(row, index) {
       this.reData = {
         ...row,
@@ -455,6 +467,22 @@ export default {
     submitData() {
       return this.feeData;
     },
+
+    //应收
+    receivable(){
+      //切换
+      this.receivableButton = "primary"
+      this.copeWithButton = ""
+
+      this.selectionCrudList;
+
+    },
+    //应付
+    copeWith(){
+      this.receivableButton = ""
+      this.copeWithButton = "primary"
+    },
+
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {

src/components/finance/applyPayment.vue

@@ -367,7 +367,7 @@ export default {
                     });
                   }else{
                     //关闭一下存在的列表页  跳转
-                    this.$router.$avueRouter.closeTag('/payment_request');
+                    this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/paymentRequest');
                     this.$router.push({
                       path: "/payment_request",
                       query: {params: res.data.data.id},

src/components/procurement/purchase.vue

@@ -52,7 +52,7 @@
     },
     methods:{
       refreshChange(){
-        this.onLoad(this.page);
+        refreshChange
       },
       close(){
         this.$emit("closeFun")

src/views/financialManagement/billDetails/billDetails.vue

@@ -132,7 +132,7 @@
         console.log('1')
       },
       refreshChange() {
-        console.log('1')
+        this.onLoad(this.page);
       },
       onLoad(page, params = {}) {
         this.loading = true;

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -1,57 +1,56 @@
 <template>
-  <div>
-    <basic-container v-if="show">
-      <avue-crud :option="option"
-                 :data="dataList"
-                 ref="crud"
-                 v-model="form"
-                 :page.sync="page"
-                 :search.sync="search"
-                 :table-loading="loading"
-                 @search-change="searchChange"
-                 @search-reset="searchReset"
-                 @selection-change="selectionChange"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
-                 @refresh-change="refreshChange"
-                 @on-load="onLoad">
-        <template slot="menuLeft">
-          <el-button type="primary"
-                     size="small"
-                     icon="el-icon-plus"
-                     @click="addReceipt">新 单
-          </el-button>
-        </template>
-        <template slot="corpIdSearch">
-          <select-component
-            v-model="search.corpId"
-            :configuration="configuration"
-          ></select-component>
-        </template>
-        <template slot-scope="scope" slot="menu">
-          <el-button
-            type="text"
-            size="small"
-            @click.stop="editOpen(scope.row, 2)"
-          >编辑
-          </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click.stop="rowDel(scope.row, scope.index)"
-          >删除
-          </el-button>
-        </template>
-      </avue-crud>
-    </basic-container>
-    <detail-page
-      ref="detail"
-      @goBack="goBack"
-      :detailData="detailData"
-      v-else
-    ></detail-page>
-  </div>
+  <basic-container v-if="show">
+    <avue-crud :option="option"
+               :data="dataList"
+               ref="crud"
+               v-model="form"
+               :page.sync="page"
+               :search.sync="search"
+               :table-loading="loading"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+      <!--  <el-button type="primary"
+                   size="small"
+                   icon="el-icon-plus"
+                   @click="addReceipt">新 单
+        </el-button>-->
+      </template>
+      <template slot="corpIdSearch">
+        <select-component
+          v-model="search.corpId"
+          :configuration="configuration"
+        ></select-component>
+      </template>
+      <template slot-scope="scope" slot="menu">
+        <el-button
+          type="text"
+          size="small"
+          @click.stop="editOpen(scope.row, 2)"
+        >编辑
+        </el-button>
+        <el-button
+          type="text"
+          size="small"
+          @click.stop="rowDel(scope.row, scope.index)"
+        >删除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+  <detail-page
+    ref="detail"
+    @goBack="goBack"
+    :detailData="detailData"
+    v-else
+  ></detail-page>
 </template>
+
 <script>
   import option from "./configuration/mainList.json";
   import { getList,remove} from "@/api/financialManagement/paymentRequest";

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -409,9 +409,9 @@
             });
           }else{
             //关闭一下存在的列表页  跳转
-            this.$router.$avueRouter.closeTag('/payment_settle');
+            this.$router.$avueRouter.closeTag('/financialManagement/paymentSettle/paymentSettle');
             this.$router.push({
-              path: "/payment_settle",
+              path: "/financialManagement/paymentSettle/paymentSettle",
               query: {params: this.form.id},
             });
           }
@@ -465,6 +465,8 @@
         this.option.column.forEach(item =>{
           if( item.prop == "remark" ){
             this.$set(item,"disabled",false)
+          }else if( item.prop == "createUserName" ||  item.prop == "createTime" ){
+            this.$set(item,"disabled",true)
           }else{
             this.$set(item,"disabled",this.checkDisabled)
           }

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -75,7 +75,7 @@
     },
     {
       "label": "备注",
-      "prop": "remark",
+      "prop": "remarks",
       "overHidden": true,
       "index": 13,
       "cell": true,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -6,12 +6,13 @@
                    @click="backToList">返回列表
         </el-button>
         <div class="upper_right_button">
+
           <el-button type="warning"
                      class="el-button--small-yh"
                      size="small"
                      :disabled="!form.id"
                      @click.stop="confirmSettlement"
-          >{{finishDisabled?"撤销付费":"付费"}}
+          >{{financeButton?"付费":"撤销付费"}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -28,7 +29,7 @@
         <avue-form class="trading-form" ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
-              :disabled="financeDisabled"
+              :disabled="!financeDisabled && form.id"
               v-model="form.corpId"
               @returnBack="returnBack"
               :configuration="configuration"
@@ -37,7 +38,7 @@
           <template slot="accountNo">
             <el-select v-model="form.accountNo"
                        placeholder="请选择"
-                       :disabled="financeDisabled"
+                       :disabled="!financeDisabled && form.id"
                        @change="accountNoChange"
                        clearable
                        filterable>
@@ -129,7 +130,7 @@
 <script>
   import option from "./configuration/detailsPage.json";
   import { getDetail,editFinance } from "@/api/financialManagement/financialManagement"
-  import { getDetails,modify,saveOrEdit } from "@/api/financialManagement/paymentRequest";
+  import { getDetails,modify,cancelModify,saveOrEdit } from "@/api/financialManagement/paymentRequest";
   import { contrastObj,contrastList } from "@/util/contrastData";
   import  billDetail from "@/components/bill/billDetailList";
   import { getlistBankBy } from "@/api/financialManagement/paymentRequest";
@@ -149,7 +150,7 @@
         itemsOption: option,
         billDetailDialog:false,
         financeDisabled:false,
-        finishDisabled:false,
+        financeButton:true,
         billType:"申请",
         params:{},
         id:"",
@@ -339,6 +340,8 @@
         getDetail(this.id).then(res => {
           this.afterEcho(res.data.data)
         })
+      }else{
+        this.form.financeStatus = "待结算"
       }
 
       if(this.detailData.params){
@@ -461,11 +464,18 @@
                 billType:"付费",
                 itemsList:this.dataList
               }
+              if(this.financeButton){
+                modify(params).then(res =>{
+                  this.$message.success("操作成功!")
+                  this.afterEcho(res.data.data)
+                })
+              }else{
+                cancelModify(params).then(res =>{
+                  this.$message.success("操作成功!")
+                  this.afterEcho(res.data.data)
+                })
+              }
 
-              modify(params).then(res =>{
-                this.$message.success("操作成功!")
-                this.afterEcho(res.data.data)
-              })
             })
             if(status === true){
               this.$emit("goBack");
@@ -494,28 +504,33 @@
       afterEcho(data){
         this.form = data;
         this.oldForm = Object.assign({},data);
-        this.finishDisabled = data.financeStatus ==="结算完成"?true:false;
-        this.financeDisabled = data.financeStatus == ("待结算" || "结算完成")?true:false;
-        //待结算  付款日期 备注  可编辑
-        if(data.financeStatus == "待结算"){
+        this.financeDisabled =  this.form.financeStatus == "待结算"?true:false;
+        //审核状态为空时  说明为新单进来
+        if(this.financeDisabled){
+          this.financeButton = true
           this.option.column.forEach(item =>{
-            if( item.prop == "remark" || item.prop == "settlementDate"){
+            if( item.prop === "remark" || item.prop === "settlementDate"){
               this.$set(item,"disabled",false)
+            }else if( item.prop === "createUserName" ||  item.prop === "createTime" ||  item.prop === "sysNo" ){
+              this.$set(item,"disabled",true)
             }else{
-              this.$set(item,"disabled",this.financeDisabled)
+              this.$set(item,"disabled",false)
             }
           })
-        }else{
+        }
+        else{
+          this.financeButton = false
           this.option.column.forEach(item =>{
-            if( item.prop == "remark"){
+            if( item.prop === "remark"){
               this.$set(item,"disabled",false)
+            }else if( item.prop === "createUserName" ||  item.prop === "createTime" ||  item.prop === "sysNo"){
+              this.$set(item,"disabled",true)
             }else{
-              this.$set(item,"disabled",this.financeDisabled)
+              this.$set(item,"disabled",true)
             }
           })
         }
 
-
         if(data.itemsList){
           this.dataList = data.itemsList
           this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -75,7 +75,7 @@
     },
     {
       "label": "备注",
-      "prop": "remark",
+      "prop": "remarks",
       "overHidden": true,
       "index": 13,
       "cell": true,

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -53,7 +53,7 @@
     },
     {
       "label": "单据状态",
-      "prop": "status",
+      "prop": "financeStatus",
       "type": "select",
       "search": true,
       "overHidden": true,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -9,14 +9,14 @@
           <el-button type="warning"
                      size="small"
                      class="el-button--small-yh"
-                     :disabled="financeDisabled || form.id"
+                     :disabled="!form.id"
                      @click.stop="confirmSettlement"
-          >{{finishDisabled?"撤销收费":"收费"}}
+          >{{financeDisabled?"收费":"撤销收费"}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
                      size="small"
-                     :disabled="financeDisabled"
+                     :disabled="!financeDisabled"
                      @click.stop="saveSettlement"
           >{{form.id?"确认修改" :"确认新增"}}
           </el-button>
@@ -31,12 +31,14 @@
             <select-component
               v-model="form.corpId"
               @returnBack="returnBack"
+              :disabled="!financeDisabled"
               :configuration="configuration"
             ></select-component>
           </template>
           <template slot="accountNo">
             <el-select v-model="form.accountNo"
                        placeholder="请选择"
+                       :disabled="!financeDisabled"
                        @change="accountNoChange"
                        clearable
                        filterable>
@@ -66,7 +68,7 @@
             <el-button type="primary"
                        size="small"
                        icon="el-icon-shopping-cart-2"
-                       :disabled="financeDisabled"
+                       :disabled="!financeDisabled"
                        @click="selectRecipt"
             >选择销售合同
             </el-button>
@@ -92,14 +94,14 @@
             <el-button
               type="text"
               size="small"
-              :disabled="financeDisabled"
+              :disabled="!financeDisabled"
               @click.stop="rowCell(scope.row,scope.index)"
             > {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
             <el-button
               type="text"
               size="small"
-              :disabled="financeDisabled"
+              :disabled="!financeDisabled"
               @click.stop="rowDel(scope.row,scope.index)"
             >删除
             </el-button>
@@ -132,7 +134,7 @@
 <script>
   import option from "./configuration/detailsPage.json";
   import { getDetail } from "@/api/financialManagement/financialManagement"
-  import { getDetails,modify,saveOrEdit } from "@/api/financialManagement/paymentRequest";
+  import { getDetails,modify,cancelModify,saveOrEdit } from "@/api/financialManagement/paymentRequest";
   import  billDetail from "@/components/bill/billDetailList";
   import _ from "lodash";
   import { getlistBankBy } from "@/api/financialManagement/paymentRequest";
@@ -301,8 +303,7 @@
           total: 0,
         },
         billDetailDialog:false,
-        financeDisabled:false,
-        finishDisabled:false,
+        financeDisabled:true,
         billType:"收费",
         //新旧数据对比
         oldForm:{},
@@ -337,6 +338,8 @@
         getDetail(this.id).then(res => {
           this.afterEcho(res.data.data)
         })
+      }else{
+        this.form.financeStatus = "待结算"
       }
 
       // if(this.detailData.params){
@@ -460,10 +463,17 @@
                 itemsList:this.dataList
               }
 
-              modify(params).then(res =>{
-                this.$message.success("操作成功!")
-                this.afterEcho(res.data.data)
-              })
+              if(this.financeDisabled){
+                modify(params).then(res =>{
+                  this.$message.success("操作成功!")
+                  this.afterEcho(res.data.data)
+                })
+              }else{
+                cancelModify(params).then(res =>{
+                  this.$message.success("操作成功!")
+                  this.afterEcho(res.data.data)
+                })
+              }
             })
             if(status === true){
               this.$emit("goBack");
@@ -493,9 +503,30 @@
         this.form = data;
         this.oldForm = Object.assign({},data);
 
-        this.finishDisabled = data.financeStatus ==="结算完成"?true:false;
-        this.financeDisabled = data.financeStatus === "待结算"?false:true;
-        this.$set(this.option,"disabled",this.financeDisabled)
+        this.financeDisabled = this.form.financeStatus === "待结算"?true:false;
+
+        if(this.financeDisabled){
+          this.option.column.forEach(item =>{
+            if( item.prop === "remark"){
+              this.$set(item,"disabled",false)
+            }else if( item.prop === "createUserName" ||  item.prop === "createTime" ||  item.prop === "sysNo" ){
+              this.$set(item,"disabled",true)
+            }else{
+              this.$set(item,"disabled",false)
+            }
+          })
+        }
+        if(this.financeDisabled === false){
+          this.option.column.forEach(item =>{
+            if( item.prop === "remark"){
+              this.$set(item,"disabled",false)
+            }else if( item.prop === "createUserName" ||  item.prop === "createTime" ||  item.prop === "sysNo"){
+              this.$set(item,"disabled",true)
+            }else{
+              this.$set(item,"disabled",true)
+            }
+          })
+        }
 
         if(data.itemsList){
           this.dataList = data.itemsList

src/views/importTrade/invoice/config/mainList.json

@@ -20,6 +20,22 @@
   "searchIndex": 2,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "totalQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "billWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceWeight",
+      "type": "sum"
+    }
+  ],
   "column":[
     {
       "label": "供应商",
@@ -69,7 +85,7 @@
     },
     {
       "label": "件数",
-      "prop": "quantity",
+      "prop": "totalQuantity",
       "overHidden": true,
       "index": 6,
       "width":100

src/views/importTrade/invoice/index.vue

@@ -123,7 +123,7 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(43), option);
   },
   mounted() {
-    this.option.height = window.innerHeight - 200;
+    // this.option.height = window.innerHeight - 200;
   },
   activated() {
     setTimeout(() => {

src/views/importTrade/receipt/config/mainList.json

@@ -20,6 +20,22 @@
   "searchIndex": 2,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "totalQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "billWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceWeight",
+      "type": "sum"
+    }
+  ],
   "column":[
     {
       "label": "供应商",
@@ -69,7 +85,7 @@
     },
     {
       "label": "件数",
-      "prop": "quantity",
+      "prop": "totalQuantity",
       "overHidden": true,
       "index": 6,
       "width":100

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -776,7 +776,6 @@ export default {
             type: "warning"
           }).then(()=>{
             this.form.deliveryItemsList = this.contactsData;
-
             confirmReceipt(this.form).then(res =>{
               if(res.data.success){
                 this.$message.success("收货成功!")
@@ -803,6 +802,7 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
           }).then(()=>{
+            this.buttonLoading = true;
             this.form.deliveryItemsList = this.contactsData;
             repealReceipt(this.form).then(res =>{
               if(res.data.success){
@@ -825,6 +825,7 @@ export default {
             this.buttonLoading = false;
           })
         }
+        this.buttonLoading = false;
       }
     },
     //导入采购明细

src/views/importTrade/receipt/index.vue

@@ -133,7 +133,7 @@ export default {
     }, 100);
   },
   mounted() {
-    this.option.height = window.innerHeight - 200;
+    // this.option.height = window.innerHeight - 200;
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/purchase/contract/config/customerContact.json

@@ -129,6 +129,19 @@
       ]
     },
     {
+      "label": "已收重量(吨)",
+      "prop": "actualWeight",
+      "index": 9,
+      "width":100,
+      "rules": [
+        {
+          "required": false,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
       "label": "税率",
       "prop": "taxRate",
       "index": 10,

src/views/purchase/contract/config/mainList.json

@@ -24,6 +24,46 @@
   "expand": true,
   "expandWidth": 38,
   "selectionWidth": 40,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "orderAmount",
+      "type": "sum"
+    },
+    {
+      "name": "billWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceWeight",
+      "type": "sum"
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceAmount",
+      "type": "sum"
+    },
+    {
+      "name": "settlmentAmount",
+      "type": "sum"
+    },
+    {
+      "name": "settlmentAmount",
+      "type": "sum"
+    }
+  ],
   "column":[
     {
       "label": "合同号",
@@ -94,14 +134,14 @@
       "width":100
     },
     {
-      "label": "码单重量",
+      "label": "码单重量(吨)",
       "prop": "billWeight",
       "overHidden": true,
       "index": 7,
       "width":100
     },
     {
-      "label": "发票重量",
+      "label": "发票重量(吨)",
       "prop": "invoiceWeight",
       "overHidden": true,
       "index": 8,
@@ -115,6 +155,13 @@
       "width":100
     },
     {
+      "label": "已收重量(吨)",
+      "prop": "actualWeight",
+      "overHidden": true,
+      "index": 9,
+      "width":100
+    },
+    {
       "label": "发票金额",
       "prop": "invoiceAmount",
       "overHidden": true,

src/views/purchase/contract/index.vue

@@ -31,14 +31,15 @@
         <template slot-scope="scope" slot="expand">
           <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
             <el-table-column   type="selection" align="center"  width="40"></el-table-column>
-            <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
             <el-table-column  label="货物品种" prop="priceCategoryNames" align="center" show-overflow-tooltip width="180"></el-table-column>
-            <el-table-column  label="件数" prop="purchaseQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="规格" prop="itemType" align="center" show-overflow-tooltip width="140"></el-table-column>
+            <el-table-column  label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="80"></el-table-column>
             <el-table-column  label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
-            <el-table-column  label="已收件数" prop="actualQuantity" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="80"></el-table-column>
+            <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="已收件数" prop="actualQuantity" align="center" show-overflow-tooltip width="80"></el-table-column>
           </el-table>
         </template>
         <template slot="menuLeft">
@@ -127,7 +128,7 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(36), option);
   },
   mounted() {
-    this.option.height = window.innerHeight - 200;
+
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)

src/views/salesManagement/salesContract/config/importInventory.json

@@ -141,6 +141,12 @@
       "width":120
     },
     {
+      "label": "已发重量(吨)",
+      "prop": "actualWeight",
+      "index": 9,
+      "width":120
+    },
+    {
       "label": "税率",
       "prop": "taxRate",
       "index": 10,

src/views/salesManagement/salesContract/config/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "searchSpan": 8,
   "searchMenuPosition": "right",
   "dialogWidth": "60%",
@@ -25,6 +25,42 @@
   "addBtnText": "新单",
   "expand": true,
   "rowKey": "id",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "orderAmount",
+      "type": "sum"
+    },
+    {
+      "name": "billWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceWeight",
+      "type": "sum"
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceAmount",
+      "type": "sum"
+    },
+    {
+      "name": "settlmentAmount",
+      "type": "sum"
+    }
+  ],
   "column":[
     {
       "label": "合同号",
@@ -103,7 +139,14 @@
     },
     {
       "label": "已发件数",
-      "prop": "invoiceWeight",
+      "prop": "actualQuantity",
+      "overHidden": true,
+      "index": 8,
+      "width":100
+    },
+    {
+      "label": "已发重量(吨)",
+      "prop": "actualWeight",
       "overHidden": true,
       "index": 8,
       "width":100

src/views/salesManagement/salesContract/index.vue

@@ -116,7 +116,7 @@ export default {
     detailPage
   },
   mounted() {
-    this.option.height = window.innerHeight - 200;
+    // this.option.height = window.innerHeight - 200;
   },
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(38), option);

vue.config.js

@@ -27,10 +27,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.1.177:1080',
-        // target: 'http://192.168.1.151:1080',
+        target: 'http://192.168.1.151:1080',
         // 打包地址.
         // target: 'http://121.37.83.47:10004',//服务器ip
-        target: 'http://trade.tubaosoft.com:10004',//服务器域名
+        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'