费用明细 审核

src/components/fee-info/main.vue

@@ -300,8 +300,8 @@ export default {
     feeUrl: {
       type: String
     },
-    feeCommit:{
-      type: Boolean
+    billUrl: {
+      type: String
     }
   },
   filters: {
@@ -418,7 +418,6 @@ export default {
       }
     },
     rateChange(row) {
-      row.exchangeRate;
       if (row.exchangeRate >= 100) {
         row.exchangeRate = 0;
         this.$message.error("汇率不能超过100%");
@@ -571,26 +570,27 @@ export default {
             }
           }
           this.isUpdata = false
+          this.selectionList.map(item =>{
+            // item.url = this.billUrl
+            item.srcOrderno = params.srcOrderno
+            item.srcParentId = params.parentId
+            item.corpsName = item.corpName
+            item.srcFeesId = item.id
+            item.costType = item.itemId
+            item.itemType = '采购'
+            item.optionType = 'JK'
+            item.srcType = 2   //费用明细申请
+          })
+          let data = {
+            billType: type,
+            itemsList : this.selectionList
+          }
           if(type === '申请'){
             this.$confirm("您确定申请货款吗？", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
             }).then(()=>{
-              this.selectionList.map(item =>{
-                item.srcOrderno = params.srcOrderno
-                item.srcParentId = params.parentId
-                item.corpsName = item.corpName
-                item.srcFeesId = item.id
-                item.costType = item.itemId
-                item.itemType = '采购'
-                item.optionType = 'JK'
-                item.srcType = 2   //费用明细申请
-              })
-              let data = {
-                billType: type,
-                itemsList : this.selectionList
-              }
               applyLoan(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
@@ -605,22 +605,6 @@ export default {
               cancelButtonText: "取消",
               type: "warning",
             }).then(()=>{
-              this.selectionList.map(item =>{
-                item.srcOrderno = params.srcOrderno
-                item.srcParentId = params.parentId
-                item.corpsName = item.corpName
-                item.srcFeesId = item.id
-                item.costType = item.itemId
-                item.itemType = '采购'
-                item.optionType = 'JK'
-                item.srcType = 2   //费用明细申请
-              })
-
-              let data = {
-                billType: type,
-                itemsList : this.selectionList
-              }
-
               paymentApply(data).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")
@@ -673,9 +657,11 @@ export default {
   watch: {
     orderFeesList: function(rows) {
       this.allData = rows ? rows : [];
+      console.log(777)
       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)  //应付
+        console.log(this.isUpdata)
         if(this.isUpdata){
           if(this.selectTab == 1){
             this.feeData = this.data_one

src/components/finance/applyPayment.vue

@@ -83,8 +83,10 @@ export default {
     arrList: {
       type: Array,
       default: []
+    },
+    billUrl:{
+      type: String
     }
-
   },
   data() {
     return {
@@ -352,6 +354,7 @@ export default {
 
             const params = {
               billType : this.billType,
+              url:this.billUrl,
               DC : this.billData.itemType === "采购"?"C":"D",     //账单明细会根据D C区分采购 销售搜索
               itemsList: itemsList
             }

src/views/approveData/configuration/mainList.json

@@ -23,61 +23,89 @@
   "headerAlign": "center",
   "column": [
     {
-      "label": "供应商",
-      "prop": "corpsId",
-      "search": false,
-      "hide": true,
+      "label": "业务类型",
+      "prop": "processType",
+      "type": "select",
+      "dicData": [
+        {
+          "label": "付费审批",
+          "value": "付费审批"
+         },
+        {
+          "label": "销售订单",
+          "value": "销售订单"
+        },
+        {
+          "label": "采购订单",
+          "value": "采购订单"
+        },
+        {
+          "label": "付费申请",
+          "value": "付费申请"
+        }
+      ],
+      "search": true,
       "overHidden": true,
-      "width": 200
+      "width": 200,
+      "index": 1
     },
     {
-      "label": "供应商",
-      "prop": "corpsName",
+      "label": "审核状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=auditStatus",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
       "overHidden": true,
       "width": 200,
-      "index": 1
+      "index": 2
     },
     {
-      "label": "采购合同号",
-      "prop": "orderNo",
-      "search": false,
+      "label": "往来单位",
+      "prop": "corpsId",
+      "search": true,
+      "hide": true,
       "overHidden": true,
-      "width": 180,
-      "index": 2
+      "width": 200
     },
     {
-      "label": "订单日期",
-      "prop": "orderDate",
-      "type": "date",
-      "search": false,
-      "unlinkPanels": true,
-      "searchRange": true,
+      "label": "往来单位",
+      "prop": "corpsName",
       "overHidden": true,
-      "format": "yyyy-MM-dd",
-      "valueFormat": "yyyy-MM-dd",
-      "width": 180,
+      "width": 200,
       "index": 3
     },
     {
-      "label": "金额",
-      "prop": "corpName",
+      "label": "业务编号",
+      "prop": "orderNo",
+      "search": true,
       "overHidden": true,
-      "width": 120,
+      "width": 180,
       "index": 4
     },
     {
       "label": "申请人",
       "prop": "sendName",
       "overHidden": true,
-      "index": 5,
+      "search": true,
+      "index": 6,
       "width": 150
     },
     {
       "label": "申请日期",
       "prop": "sendTime",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
       "overHidden": true,
-      "width": 180,
-      "index": 6
+      "index": 7,
+      "width":200
     }
   ]
 }

src/views/approveData/index.vue

@@ -20,11 +20,32 @@
           :configuration="configuration"
         ></select-component>
       </template>
+      <template slot="menuLeft">
+        <el-button size="small"
+                   type="success"
+                   :disabled="true"
+                   @click.stop=""
+        >批量审批
+        </el-button>
+        <el-button size="small"
+                   type="info"
+                   :disabled="true"
+                   @click.stop=""
+        >报表
+        </el-button>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
           size="small"
           :disabled="scope.row.operate"
+          @click.stop="jumpPage(scope.row)"
+        >查看
+        </el-button>
+        <el-button
+          type="text"
+          size="small"
+          :disabled="scope.row.operate"
           @click.stop="pass(scope.row, 1)"
         >审批通过
         </el-button>
@@ -81,6 +102,15 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      jumpPage(row){
+        if(row.url){
+            this.$router.$avueRouter.closeTag(row.url);
+            this.$router.push({
+              path: row.url,
+              query: {check : row},
+            });
+        }
+      },
       //审批通过
       pass(row,operate){
         row.operate =  operate

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

@@ -66,7 +66,7 @@
       "index": 4
     },
     {
-      "label": "单据状态",
+      "label": "单据来源",
       "prop": "billType",
       "type": "select",
       "search": true,

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

@@ -20,7 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
-  "expand": true,
+  "expand": false,
   "expandWidth": 38,
   "selectionWidth": 40,
   "showSummary": true,
@@ -84,13 +84,20 @@
       ]
     },
     {
-      "label": "总金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 4
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 4
+    },
+    {
       "label": "开户银行",
       "prop": "accountBank",
       "overHidden": true,

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -37,6 +37,7 @@
         <el-button
           type="text"
           size="small"
+          :disabled="scope.row.checkStatus == '审核中' ||  scope.row.checkStatus == '请核成功'"
           @click.stop="rowDel(scope.row, scope.index)"
         >删除
         </el-button>

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -129,7 +129,7 @@
 <script>
   import itemOption from "./configuration/detailsPage.json";
   import { contrastObj,contrastList } from "@/util/contrastData";
-  import { getDetails,modify,submit, paymentCheck,getlistBankBy } from "@/api/financialManagement/paymentRequest";
+  import { getDetails,modify,submit, paymentCheck,getlistBankBy,saveOrEdit } from "@/api/financialManagement/paymentRequest";
   import _ from "lodash";
 
   export default {
@@ -235,7 +235,7 @@
               ]
             },
             {
-              label: '总金额',
+              label: '人民币金额',
               prop: 'amount',
               span: 8,
               rules: [
@@ -247,6 +247,18 @@
               ]
             },
             {
+              label: '外币金额',
+              prop: 'foreignAmount',
+              span: 8,
+              rules: [
+                {
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '申请人',
               prop: 'createUserName',
               span: 8,
@@ -445,7 +457,7 @@
               itemsList:this.dataList
             }
             this.buttonLoading = true
-            submit(params).then(res =>{
+            saveOrEdit(params).then(res =>{
               this.$message.success("操作成功!")
               this.afterEcho(res.data.data)
             }).finally(()=>{

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

@@ -79,13 +79,20 @@
       ]
     },
     {
-      "label": "金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 5
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 5
+    },
+    {
       "label": "结算日期",
       "prop": "settlementDate",
       "overHidden": true,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -231,7 +231,7 @@
               ]
             },
             {
-              label: '总金额',
+              label: '人民币金额',
               prop: 'amount',
               span: 8,
               rules: [
@@ -248,23 +248,36 @@
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '外币金额',
+              prop: 'foreignAmount',
               span: 8,
-              disabled:true,
               rules: [
                 {
-                  required: false,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '制单日期',
-              prop: 'createTime',
+              label: '付款日期',
+              prop: 'settlementDate',
+              format:"yyyy-MM-dd",
+              valueFormat:"yyyy-MM-dd 00:00:00",
               span: 8,
               type:"date",
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '制单人',
+              prop: 'createUserName',
+              span: 8,
               disabled:true,
               rules: [
                 {
@@ -275,12 +288,11 @@
               ]
             },
             {
-              label: '付款日期',
-              prop: 'settlementDate',
-              format:"yyyy-MM-dd",
-              valueFormat:"yyyy-MM-dd 00:00:00",
+              label: '制单日期',
+              prop: 'createTime',
               span: 8,
               type:"date",
+              disabled:true,
               rules: [
                 {
                   required: false,
@@ -379,10 +391,10 @@
         })
       },
       thisAmountChange(row){
-        if(row.thisAmount > row.maxThisAmount){
-          this.$message.error("本次结算金额不能大于剩余结算金额!")
-          row.thisAmount = 0;
-        }
+        // if(row.thisAmount > row.maxThisAmount){
+        //   this.$message.error("本次结算金额不能大于剩余结算金额!")
+        //   row.thisAmount = 0;
+        // }
       },
       selectPurchase(){
         if(!this.form.corpId){

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

@@ -79,13 +79,20 @@
       ]
     },
     {
-      "label": "总金额",
+      "label": "人民币金额",
       "prop": "amount",
       "overHidden": true,
       "width": 120,
       "index": 5
     },
     {
+      "label": "外币金额",
+      "prop": "foreignAmount",
+      "overHidden": true,
+      "width": 120,
+      "index": 5
+    },
+    {
       "label": "收款日期",
       "prop": "settlementDate",
       "overHidden": true,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -241,23 +241,22 @@
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '外币金额',
+              prop: 'foreignAmount',
               span: 8,
-              disabled:true,
               rules: [
                 {
-                  required: false,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '制单日期',
-              prop: 'createTime',
+            },
+            {
+              label: '收款日期',
+              prop: 'time',
               span: 8,
               type:"date",
-              disabled:true,
               rules: [
                 {
                   required: false,
@@ -267,10 +266,23 @@
               ]
             },
             {
-              label: '收款日期',
-              prop: 'time',
+              label: '制单人',
+              prop: 'createUserName',
+              span: 8,
+              disabled:true,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }, {
+              label: '制单日期',
+              prop: 'createTime',
               span: 8,
               type:"date",
+              disabled:true,
               rules: [
                 {
                   required: false,

src/views/purchase/contract/detailsPage.vue

@@ -5,14 +5,7 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-      <div class="upper_right_button">
-        <el-button type="primary"
-                   class="el-button--small-yh"
-                   size="small"
-                   :loading="buttonLoading"
-                   :disabled="true"
-                   @click.stop="">请核
-        </el-button>
+      <div v-if="!checkDisabled"  class="upper_right_button">
         <el-button type="warning"
                    size="small"
                    class="el-button--small-yh "
@@ -20,12 +13,6 @@
                    :disabled="!form.id"
                    @click.stop="applyPayment('申请')">申请货款
         </el-button>
-<!--        <el-button type="warning"
-                   size="small"
-                   class="el-button&#45;&#45;small-yh "
-                   :loading="buttonLoading"
-                   @click.stop="applyPayment()">取消货款
-        </el-button>-->
         <el-button type="info"
                    size="small"
                    :loading="buttonLoading"
@@ -57,6 +44,22 @@
         >{{form.id?'确认修改':'确认新增'}}
         </el-button>
       </div>
+        <div v-if="checkDisabled" class="upper_right_button">
+          <el-button type="success"
+                     size="small"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="approveOperation(1)">
+            审核通过
+          </el-button>
+          <el-button type="warning"
+                     size="small"
+                     class="el-button--small-yh"
+                     :loading="buttonLoading"
+                     @click.stop="approveOperation(2)">
+            审核驳回
+          </el-button>
+        </div>
     </div>
     </div>
     <div class="customer-main">
@@ -230,14 +233,14 @@
               <el-button
                 type="text"
                 size="small"
-                :disabled="row.actualQuantity !=0"
+                :disabled="row.actualQuantity !=0 || checkDisabled"
                 @click="rowCell(row,index)"
               >{{ row.$cellEdit ? '修改完成' : '修改' }}
               </el-button>
               <el-button
                 type="text"
                 size="small"
-                :disabled="row.actualQuantity !=0"
+                :disabled="row.actualQuantity !=0 || checkDisabled"
                 @click="rowDel(row,index)"
               >删除
               </el-button>
@@ -246,12 +249,14 @@
               <el-button type="primary"
                          icon="el-icon-plus"
                          size="small"
+                         :disabled=" checkDisabled"
                          @click="commoditySelection"
               >录入明细
               </el-button>
               <el-button type="warning"
                          size="small"
-                         :disabled="selectContact.length == 0"
+
+                         :disabled="selectContact.length == 0 || checkDisabled"
                          @click="beforePage(false)"
               >生成收货单
               </el-button>
@@ -261,12 +266,14 @@
         <fee-info
           ref="feeInfo"
           :orderFeesList="orderFeesList"
+          :disabled="checkDisabled"
           @beforeFinance="beforeFinance"
           feeUrl=""
         />
         <upload-file
           ref="uploadFile"
           title="合同附件"
+          :disabled="checkDisabled"
           :orderFilesList="orderFilesList"
           delUrl=""
         />
@@ -302,6 +309,7 @@
       v-dialog-drag
     >
       <apply-payment
+        :billUrl="billUrl"
         :billType="billType"
         :billData="billData"
         @choceFun="choceFun"
@@ -326,6 +334,8 @@ 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 { approvePass } from "@/api/approveData/main"
+
 export default {
   name: "detailsPage",
   props: {
@@ -351,7 +361,9 @@ export default {
       applicationDialog:false,
       commodityData: false,
       takeDisabled:false, //收货状态
+      checkDisabled:false,
       tableData: [],
+      billUrl:"/purchase/contract/index",
       billType:"",
       billData:{},
       contractTypeDic:[],
@@ -682,7 +694,7 @@ export default {
             ]
           },
           {
-            label: '已付金额',
+            label: '已付人民币金额',
             prop: 'settlmentAmount',
             disabled: true,
             rules: [
@@ -694,6 +706,18 @@ export default {
             ]
           },
           {
+            label: '已付外币金额',
+            prop: 'foreignSettlmentAmount',
+            disabled: true,
+            rules: [
+              {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '发票重量',
             prop: 'invoiceWeight',
             disabled: true,
@@ -750,7 +774,17 @@ export default {
       }).finally(()=>{
         this.buttonLoading = false;
       })
-    }else{
+    } if(this.detailData.check){
+      this.checkDisabled = true
+      this.buttonLoading = true;
+      detailListData(this.detailData.check.billId).then(res => {
+        this.form = res.data.data;
+        this.afterEcho(res.data.data)
+      }).finally(()=>{
+        this.buttonLoading = false;
+      })
+    }
+    else{
       this.$set(this.form,"currency","USD")
       this.$set(this.form,"exchangeRate",6.3686)
     }
@@ -816,25 +850,31 @@ export default {
     beforeFinance(feesData,callback){
       this.orderFeesList = feesData;
       let params = {}
-      if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
-        || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
-      ){
-        this.$confirm("数据发生变化，请先提交保存？", {
-          confirmButtonText: "保存",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.editCustomer();
-        }).finally(()=>{
-          params.valid = false
-          callback(params)
-        })
-      }else{
-        params.valid = true
-        params.parentId = this.form.id
-        params.srcOrderno = this.form.orderNo
-        callback(params)
-      }
+      params.valid = true
+      params.parentId = this.form.id
+      params.srcOrderno = this.form.orderNo
+      callback(params)
+
+      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
+      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
+      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      // ){
+      //   this.$confirm("数据发生变化，请先提交保存？", {
+      //     confirmButtonText: "保存",
+      //     cancelButtonText: "取消",
+      //     type: "warning"
+      //   }).then(() => {
+      //     this.editCustomer();
+      //   }).finally(()=>{
+      //     params.valid = false
+      //     callback(params)
+      //   })
+      // }else{
+      //   params.valid = true
+      //   params.parentId = this.form.id
+      //   params.srcOrderno = this.form.orderNo
+      //   callback(params)
+      // }
     },
     //修改提交触发
     editCustomer(status) {
@@ -1045,6 +1085,17 @@ export default {
         this.applyPaymentDialog = true;
       }
     },
+    approveOperation(operate){
+      this.detailData.check.operate = operate
+      this.buttonLoading = true;
+      approvePass(this.detailData.check).then(res=>{
+        this.$message.success("操作成功!")
+
+        //操作成功之后需要 禁用通过驳回吗》‘
+      }).finally(()=>{
+        this.buttonLoading = false
+      })
+    },
     //新增商品明细保存触发
     rowSave(row, done, loading) {
       // this.contactsData.push(row)

src/views/purchase/contract/index.vue

@@ -127,6 +127,16 @@ export default {
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(36), option);
   },
+  activated() {
+    setTimeout(() => {
+      if(this.$route.query.check){
+        this.detailData={
+          check:this.$route.query.check
+        }
+        this.show = false;
+      }
+    }, 100);
+  },
   mounted() {
 
   },
@@ -173,7 +183,6 @@ export default {
     //查询全部
     initData() {
       customerList().then(res => {
-        console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });

src/views/salesManagement/salesContract/detailsPage.vue

@@ -246,6 +246,7 @@
         </basic-container>
         <fee-info
           ref="feeInfo"
+          @beforeFinance="beforeFinance"
           :orderFeesList="orderFeesList"
           feeUrl=""
         />
@@ -291,6 +292,7 @@
       v-dialog-drag
     >
       <apply-payment
+        :billUrl="billUrl"
         :billType="billType"
         :billData="billData"
         @choceFun="choceFun"
@@ -342,6 +344,7 @@ export default {
       currencyDic:[],
       contractDic:[],
       selectKind:-1,
+      billUrl:"",
       billType:"",
       billData:{},
       configuration:{
@@ -519,7 +522,7 @@ export default {
             ]
           },
           {
-            label: '已收金额',
+            label: '已收人民币金额',
             prop: 'settlmentAmount',
             disabled: true,
             rules: [
@@ -536,11 +539,16 @@ export default {
             ]
           },
           {
-            label: '发票重量',
-            prop: 'invoiceWeight',
+            label: '已收外币金额',
+            prop: 'foreignSettlmentAmount',
             disabled: true,
             rules: [
               {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: ' ',
+                trigger: 'blur'
+              },
+              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -548,9 +556,9 @@ export default {
             ]
           },
           {
-            label: '码单重量',
-            prop: 'billWeight',
-            disabled: true,
+            label: '计划交期',
+            prop: 'plannedDeliveryDate',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -560,16 +568,11 @@ export default {
             ]
           },
           {
-            label: '结余金额',
-            prop: '',
+            label: '发票重量',
+            prop: 'invoiceWeight',
             disabled: true,
             rules: [
               {
-                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                message: ' ',
-                trigger: 'blur'
-              },
-              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -577,9 +580,9 @@ export default {
             ]
           },
           {
-            label: '计划交期',
-            prop: 'plannedDeliveryDate',
-            type: 'datetime',
+            label: '码单重量',
+            prop: 'billWeight',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -808,6 +811,35 @@ export default {
         this.billData.srcId = -1
       }
     },
+    beforeFinance(feesData,callback) {
+      this.orderFeesList = feesData;
+      let params = {}
+      params.valid = true
+      params.parentId = this.form.id
+      params.srcOrderno = this.form.orderNo
+      callback(params)
+
+      //传过来的数据  会根据应收应付的顺序放到 orderFeesList   这个时候与旧值对比  会对比失败  后端查费用明细时  按照应收应付顺序 进行排序
+      // if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
+      //   || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
+      // ){
+      //   this.$confirm("数据发生变化，请先提交保存？", {
+      //     confirmButtonText: "保存",
+      //     cancelButtonText: "取消",
+      //     type: "warning"
+      //   }).then(() => {
+      //     this.editCustomer();
+      //   }).finally(()=>{
+      //     params.valid = false
+      //     callback(params)
+      //   })
+      // }else{
+      //   params.valid = true
+      //   params.parentId = this.form.id
+      //   params.srcOrderno = this.form.orderNo
+      //   callback(params)
+      // }
+    },
     //申请结算
     applySettlement(type){
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)