进口 需求

src/components/finance/applyPayment.vue

@@ -11,7 +11,10 @@
             <selectComponent v-model="corpId" :configuration="configuration"/>
           </template>
           <template slot-scope="scope" slot="billNo">
-            <el-select placeholder="请选择" v-model="item.form.billNo" clearable>
+            <el-select placeholder="请选择" v-model="item.form.billNo"   filterable
+                       allow-create
+                       default-first-option
+                       clearable>
               <el-option
                 v-for="item in item.form.billNoList"
                 :key="item"
@@ -26,22 +29,23 @@
                :configuration="breakConfiguration">
             </breakdown-select>
           </template>
-         <!-- <template slot-scope="scope" slot="price">
+<!--          <template slot-scope="scope" slot="price">-->
+<!--            <el-input-->
+<!--              v-model="item.form.price"-->
+<!--              autocomplete="off"-->
+<!--              placeholder="请输入 单价"-->
+<!--              @input="calculate(item.form)"-->
+<!--            ></el-input>-->
+<!--          </template>-->
+          <template slot-scope="scope" slot="taxRate">
             <el-input
-              v-model="item.form.price"
+              v-model="item.form.taxRate"
+              oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
               autocomplete="off"
-              placeholder="请输入 单价"
-              @input="calculate(item.form)"
-            ></el-input>
+            >
+              <i slot="suffix" style="margin-right: 10px;">%</i>
+            </el-input>
           </template>
-          <template slot-scope="scope" slot="quantity">
-            <el-input
-              v-model="item.form.quantity"
-              autocomplete="off"
-              placeholder="请输入 数量"
-              @input="calculate(item.form)"
-            ></el-input>
-          </template>-->
           <template slot-scope="scope" slot="currency">
             <el-select v-model="item.form.currency" size="small" placeholder="请选择 币别" @change="currencyChange(item.form)" clearable filterable>
               <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
@@ -146,7 +150,7 @@ export default {
               span: 8,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }

src/views/financialManagement/billDetails/billDetails.vue

@@ -13,6 +13,7 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
+               :row-style="rowStyle"
                @on-load="onLoad">
       <template slot="corpIdSearch">
         <select-component
@@ -33,6 +34,7 @@
 <script>
   import option from "./configuration/mainList.json";
   import { getBillList } from "@/api/financialManagement/paymentRequest";
+  import _ from "lodash";
 
   export default {
     data() {
@@ -118,6 +120,13 @@
       refreshChange() {
         this.onLoad(this.page);
       },
+      rowStyle(data){
+        if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
+            return  {
+              background: "rgba(248,203,203,0.56)"
+            }
+        }
+      },
       onLoad(page, params = {}) {
         this.loading = true;
         if (params.createTime != undefined) {  //合同

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

@@ -20,6 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
+  "menu": false,
   "headerAlign": "center",
   "showSummary": true,
   "summaryText": "合计",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -100,8 +100,10 @@
               <span v-else>{{ row.contractNumber }}</span>
             </template>
             <template slot="priceCategory" slot-scope="{row,index}">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <goods-select
                 v-if="row.$cellEdit"
+                style="width:90%"
                 v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value,row)"
                 :configuration="itemConfiguration"
@@ -144,6 +146,7 @@
               <span v-else>{{ row.price }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.actualQuantity"
@@ -176,8 +179,10 @@
               <span v-else>{{ row.currency }}</span>
             </template>
             <template slot="cntrNo" slot-scope="{ row }">
+              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-select v-if="row.$cellEdit"
                          v-model="row.cntrNo"
+                         style="width:90% !important;"
                          size="small"
                          placeholder="请选择"
                          @change="selectCntrNoList(row)"
@@ -192,6 +197,18 @@
               </el-select>
               <span v-else>{{ row.cntrNo }}</span>
             </template>
+            <template slot="taxRate" slot-scope="{ row }">
+              <el-input
+                v-if="row.$cellEdit"
+                v-model="row.taxRate"
+                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-top:3px;margin-right: 10px;display:inline-block">%</i>
+              </el-input>
+              <span v-else>{{ row.taxRate }}</span>
+            </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -697,18 +714,12 @@ export default {
     // },
     //单价
     priceChange(row) {
-      if (!row.price) {
-        row.price = "";
-        row.contractAmount = 0
-      } else {
+      if (row.price && row.billWeight) {
         row.contractAmount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
     billWeightChange(row) {
-      if (!row.invoiceWeight) {
-        row.billWeight = "";
-        row.contractAmount = 0
-      } else {
+      if (row.billWeight &&  row.price) {
         row.contractAmount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
@@ -718,10 +729,6 @@ export default {
         item.contractNumber = item.orgOrderNo;
         item.contractAmount = item.amount;
         item.actualQuantity = item.orderQuantity;
-        // item.singleton = {
-        //   BQ :  item.billWeight && item.orderQuantity?_.divide(item.billWeight, item.orderQuantity):0,
-        //   IQ : item.invoiceWeight && item.orderQuantity?_.divide(item.invoiceWeight, item.orderQuantity):0
-        // }
         this.selectInventory(item);
         delete item.id
         this.$refs.crudContact.rowCellAdd(item);
@@ -869,6 +876,25 @@ export default {
             return this.$message.error(`请输入第${i + 1}行的件数`);
           }
         }
+
+        for (let i = 0; i < this.contactsData.length; i++) {
+          if (this.contactsData[i].billNo === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的提单号`);
+          }
+          if (this.contactsData[i].contractNumber === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的合同号`);
+          }
+          if (this.contactsData[i].priceCategory === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的货物品种`);
+          }
+          if (this.contactsData[i].cntrNo === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的箱号`);
+          }
+          if (this.contactsData[i].actualQuantity === (null || "" )) {
+            return this.$message.error(`请输入第${i + 1}行的件数`);
+          }
+        }
+
         this.form.billNo = this.contactsData.map(item => {
           return item.billNo
         }).join(",")

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

@@ -86,12 +86,14 @@
     {
       "label": "库存件数",
       "prop": "inventoryNumber",
+      "hide": true,
       "index": 5,
       "width":120
     },
     {
       "label": "库存重量(吨)",
       "prop": "inWeight",
+      "hide": true,
       "index": 5,
       "width":120
     },

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -42,7 +42,7 @@
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" :disabled="receiptDisable" size="small" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <selectComponent v-else-if="item.prop === 'corpId'" :disabled="receiptDisable" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable" @change="warehouseChange" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
+                <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname" :value="item.id"></el-option>
                 </el-select>
 <!--                <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" @change="warehouseChange" :configuration="configuration" />-->
@@ -120,12 +120,10 @@
                 v-model="row.cntrNo"
                 placeholder="请输入"
                 size="small"
-                @change="selectInventory(row)"
               ></el-input>
               <span v-else>{{ row.cntrNo }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
-              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 style="width:90%"
                 v-if="row.$cellEdit"
@@ -193,6 +191,18 @@
               </el-select>
               <span v-else>{{ row.currency }}</span>
             </template>
+            <template slot="taxRate" slot-scope="{ row }">
+              <el-input
+                v-if="row.$cellEdit"
+                v-model="row.taxRate"
+                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-top:3px;margin-right: 10px;display:inline-block">%</i>
+              </el-input>
+              <span v-else>{{ row.taxRate }}</span>
+            </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button
                 type="text"
@@ -554,43 +564,43 @@ export default {
     //货物名称 回显
     valueName(value,row){
       this.$set(row,"priceCategory",value)
-      this.selectInventory(row)
+      // this.selectInventory(row)
     },
     //选择仓库  带出库存
-    warehouseChange(){
-      this.contactsData.forEach(item =>{
-        this.selectInventory(item);
-      })
-    },
-    //查询库存
-    selectInventory(row){
-      if(row.billNo && row.contractNumber && row.cntrNo && row.priceCategory && this.form.storageId){
-        const params = {
-          billNo:row.billNo,
-          contractNumber:row.contractNumber,
-          goodsId:row.priceCategory,
-          storageId:this.form.storageId,
-          cntrNo:row.cntrNo
-        }
-        selectJKGoodsNum(params).then(res =>{
-          if(res.data.data){
-            this.$set(this.contactsData[row.$index],"inventoryNumber",res.data.data.inQuantity)
-            this.$set(this.contactsData[row.$index],"inWeight",res.data.data.inWeight)
-          }else {
-            this.$set(this.contactsData[row.$index],"inventoryNumber",0.00)
-            this.$set(this.contactsData[row.$index],"inWeight",0.00)
-          }
-        })
-      }
-    },
+    // warehouseChange(){
+    //   this.contactsData.forEach(item =>{
+    //     this.selectInventory(item);
+    //   })
+    // },
+    // //查询库存
+    // selectInventory(row){
+    //   if(row.billNo && row.contractNumber && row.cntrNo && row.priceCategory && this.form.storageId){
+    //     const params = {
+    //       billNo:row.billNo,
+    //       contractNumber:row.contractNumber,
+    //       goodsId:row.priceCategory,
+    //       storageId:this.form.storageId,
+    //       cntrNo:row.cntrNo
+    //     }
+    //     selectJKGoodsNum(params).then(res =>{
+    //       if(res.data.data){
+    //         this.$set(this.contactsData[row.$index],"inventoryNumber",res.data.data.inQuantity)
+    //         this.$set(this.contactsData[row.$index],"inWeight",res.data.data.inWeight)
+    //       }else {
+    //         this.$set(this.contactsData[row.$index],"inventoryNumber",0.00)
+    //         this.$set(this.contactsData[row.$index],"inWeight",0.00)
+    //       }
+    //     })
+    //   }
+    // },
 
     //拿到所有明细合同号 去重加逗号放到主表合同号
     sumOrderNo(row){
       const contractNumberList =  this.contactsData.map(item =>{return  item.contractNumber})
       this.$set(this.form,'orderNo', Array.from(new Set(contractNumberList)).join(","))
-      if(row){
-        this.selectInventory(row);
-      }
+      // if(row){
+      //   this.selectInventory(row);
+      // }
     },
     //计算
     // actualQuantityChange(row){
@@ -632,24 +642,18 @@ export default {
       }).catch(()=>{
         row.contractNumber = ''
       })
-      this.selectInventory(row);
+      // this.selectInventory(row);
     },
     //单价
     priceChange(row) {
-      if (!row.price) {
-        row.price = "";
-        row.contractAmount = 0
-      } else {
-        row.contractAmount = _.multiply(row.billWeight,row.price).toFixed(2);
+      if (row.price && row.billWeight) {
+        row.contractAmount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
     //码单重量
     billWeightChange(row) {
-      if (!row.billWeight) {
-        row.billWeight = "";
-        row.contractAmount = 0
-      } else {
-        row.contractAmount = _.multiply(row.billWeight,row.price).toFixed(2);
+      if (row.billWeight &&  row.price) {
+        row.contractAmount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
     //新增商品信息保存触发
@@ -714,9 +718,6 @@ export default {
           if (this.contactsData[i].actualQuantity === (null || "" )) {
             return this.$message.error(`请输入第${i + 1}行的件数`);
           }
-          if (this.contactsData[i].billWeight === (null || "" )) {
-            return this.$message.error(`请输入第${i + 1}行的码单重量`);
-          }
         }
         this.form.billNo = this.contactsData.map(item =>{return item.billNo}).join(",")
         if (valid) {
@@ -841,7 +842,7 @@ export default {
         // }
         delete item.id
         this.$refs.crudContact.rowCellAdd(item);
-        this.selectInventory(item)
+        // this.selectInventory(item)
       })
 
       this.totalChange()

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

@@ -145,7 +145,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 10,
-      "width":180,
+      "width":120,
       "rules": [
         {
           "required": false,

src/views/purchase/contract/detailsPage.vue

@@ -17,6 +17,7 @@
                    size="small"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
+                   :disabled="!form.id"
                    @click.stop="applyPayment('申请')">申请货款
         </el-button>
 <!--        <el-button type="warning"
@@ -28,6 +29,7 @@
         <el-button type="info"
                    size="small"
                    :loading="buttonLoading"
+                   :disabled="!form.id"
                    @click="openApplicationDialog"
         >查看申请记录
         </el-button>
@@ -35,6 +37,7 @@
                    size="small"
                    class="el-button--small-yh "
                    :loading="buttonLoading"
+                   :disabled="!form.id"
                    @click.stop="applyPayment('收费')">退款
         </el-button>
         <el-button type="success"
@@ -187,7 +190,6 @@
               <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
-              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 style="width:90% !important;"
                 v-if="row.$cellEdit"
@@ -213,13 +215,14 @@
               <span v-else>{{ row.amount }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
-              <el-input v-if="row.$cellEdit"
-                        v-model="row.taxRate"
-                        size="small"
-                        autocomplete="off"
-                        placeholder="请输入">
-<!--                <template slot="append"
-                >%</template>-->
+              <el-input
+                v-if="row.$cellEdit"
+                v-model="row.taxRate"
+                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-top:3px;margin-right: 10px;display:inline-block">%</i>
               </el-input>
               <span v-else>{{ row.taxRate }}</span>
             </template>
@@ -655,6 +658,18 @@ export default {
             ]
           },
           {
+            label: '最迟付款日期',
+            prop: 'LatestDate',
+            type:'date',
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: '预付(保证)金额',
             prop: 'advancePayment',
             rules: [
@@ -849,9 +864,6 @@ export default {
             if (this.contactsData[j].invoiceWeight === (null || "")) {
               return this.$message.error(`请输入采购明细第${j + 1}行的发票重量`);
             }
-            if (this.contactsData[j].billWeight === (null || "")) {
-              return this.$message.error(`请输入采购明细第${j + 1}行的码单重量`);
-            }
             if (this.contactsData[j].price === (null || "")) {
               return this.$message.error(`请输入采购明细第${j + 1}行的单价`);
             }
@@ -990,6 +1002,7 @@ export default {
         itemType:"采购",
         optionType:'JK',
         billNoList: this.contactsData.map(item =>{return item.billNo}),
+        price:this.form.salesPrice,
         corpsName:this.form.corpsName,
         corpId:this.form.corpId,
         accDate:this.form.businesDate,

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

@@ -44,18 +44,6 @@
       "type": "sum"
     },
     {
-      "name": "outAmount",
-      "type": "sum"
-    },
-    {
-      "name": "balanceAmount",
-      "type": "sum"
-    },
-    {
-      "name": "inAmount",
-      "type": "sum"
-    },
-    {
       "name": "balanceQuantity",
       "type": "sum"
     },
@@ -138,13 +126,6 @@
       "width": 120
     },
     {
-      "label": "入库金额",
-      "prop": "inAmount",
-      "overHidden": true,
-      "index": 8,
-      "width": 120
-    },
-    {
       "label": "出库件数",
       "prop": "outQuantity",
       "overHidden": true,
@@ -159,13 +140,6 @@
       "width": 120
     },
     {
-      "label": "出库金额",
-      "prop": "outAmount",
-      "overHidden": true,
-      "index": 11,
-      "width": 120
-    },
-    {
       "label": "结余件数",
       "prop": "balanceQuantity",
       "overHidden": true,
@@ -178,13 +152,6 @@
       "overHidden": true,
       "index": 13,
       "width": 120
-    },
-    {
-      "label": "结余金额",
-      "prop": "balanceAmount",
-      "overHidden": true,
-      "index": 14,
-      "width": 120
     }
   ]
 }

src/views/salesManagement/salesContract/detailsPage.vue

@@ -173,7 +173,6 @@
               <span v-else>{{ row.invoiceWeight }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
-              <span v-if="row.$cellEdit" class="required_fields">*</span>
               <el-input
                 v-if="row.$cellEdit"
                 v-model="row.billWeight"
@@ -198,6 +197,18 @@
               ></el-input>
               <span v-else>{{ row.amount }}</span>
             </template>
+            <template slot="taxRate" slot-scope="{ row }">
+              <el-input
+                v-if="row.$cellEdit"
+                v-model="row.taxRate"
+                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-top:3px;margin-right: 10px;display:inline-block">%</i>
+              </el-input>
+              <span v-else>{{ row.taxRate }}</span>
+            </template>
             <template slot="menuLeft" slot-scope="{ row }">
               <el-button type="primary"
                          icon="el-icon-plus"
@@ -549,6 +560,23 @@ export default {
             ]
           },
           {
+            label: '结余金额',
+            prop: '',
+            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'
+              }
+            ]
+          },
+          {
             label: '计划交期',
             prop: 'plannedDeliveryDate',
             type: 'datetime',
@@ -753,20 +781,14 @@ export default {
     },
     //单价
     priceChange(row) {
-      if (!row.price) {
-        row.price = "";
-        row.amount = 0
-      } else {
+      if (row.price && row.billWeight) {
         row.amount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
     //数量
     billWeightChange(row) {
-      if (!row.billWeight) {
-        row.billWeight = "";
-        row.amount = 0
-      } else {
-        row.amount =_.multiply(row.billWeight,row.price).toFixed(2);
+      if (row.price && row.billWeight) {
+        row.amount = _.multiply(row.billWeight, row.price).toFixed(2);
       }
     },
     beforeBillData(bool,type){
@@ -858,9 +880,6 @@ export default {
             if (this.importInventoryData[j].invoiceWeight === (null || "")) {
               return this.$message.error(`请输入销售明细第${j + 1}行的发票重量`);
             }
-            if (this.importInventoryData[j].billWeight === (null || "")) {
-              return this.$message.error(`请输入销售明细第${j + 1}行的码单重量`);
-            }
             if (this.importInventoryData[j].price === (null || "")) {
               return this.$message.error(`请输入销售明细第${j + 1}行的单价`);
             }

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

@@ -384,26 +384,12 @@
               prop: 'settlmentAmount',
               disabled: true,
               type:'unit',
-              rules: [
-                {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
             },
             {
               label: '未收金额',
               type:'unit',
               prop: 'balanceAmount',
               disabled: true,
-              rules: [
-                {
-                  pattern:/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
             },
             {
               label: '总服务费',
@@ -683,9 +669,7 @@
           projectDetail(this.id,"0,1,2,3,4,5").then(res =>{
             this.form = res.data.data;
             this.oldForm = Object.assign({},res.data.data);
-            console.log(res.data.data.corpName)
             this.configuration.dicData = this.form.corpName;
-            // this.configuration.dicData = res.data.data.corpName; //给客户名称赋值
             if(res.data.data.itemList){
               this.operationDetailList(res.data.data.itemList);
             }
@@ -827,7 +811,7 @@
       },
       //新增 修改
       editMainProject(pleaseCheck){
-        this.$refs["form"].validate((valid) => {
+        this.$refs["form"].validate((valid)  => {
           //校验明细列表
           let valids = true;
           if(this.data.length !=0){
@@ -841,6 +825,8 @@
               }
             })
           }
+          console.log(valids)
+          console.log(valid)
           if(valid && valids){
             const params = {
               ...this.form,

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

@@ -82,8 +82,8 @@
         "label": "title",
         "value": "value"
       },
-      "cell": true,
       "slot": true,
+      "cell": true,
       "width": 150,
       "rules": [
         {

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

@@ -32,6 +32,10 @@
     {
       "name": "matMoney",
       "type": "sum"
+    },
+    {
+      "name": "grossIncome",
+      "type": "sum"
     }
   ],
   "column": [

src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -357,26 +357,12 @@
               prop: 'balanceAmount',
               type:'unit',
               disabled: true,
-              rules: [
-                {
-                  pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
             },
             {
               label: '已收金额',
               prop: 'settlmentAmount',
               type:'unit',
               disabled: true,
-              rules: [
-                {
-                  pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
             },
             {
               label: '服务费',
@@ -719,8 +705,11 @@
         console.log('1')
       },
       rowCell(row, index) {
-        this.$refs.crud.rowCell(row, index);
-        // row.$cellEdit = !row.$cellEdit
+        if(row.$cellEdit){
+          row.$cellEdit = !row.$cellEdit
+        }else{
+          this.$refs.crud.rowCell(row, index);
+        }
       },
       rowUpdate(row, index, done, loading) {
         done(row);