修改bug

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -35,6 +35,16 @@
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
         <avue-form class="trading-form" ref="form" v-model="form" :option="option">
+          <template slot="caseOverPayment">
+            <el-input
+              placeholder="请输入"
+              clearable
+              v-model="form.caseOverPayment"
+              @change="caseOverPaymentChange"
+              v-input-limit="2"
+              :disabled="dataList.length == 0 || (!financeDisabled && form.id) || editDisable"
+            ></el-input>
+          </template>
           <template slot="corpId">
             <crop-select
               v-model="form.corpId"
@@ -137,16 +147,6 @@
             ></el-input>
             <span v-else>{{ row.thisAmount }}</span>
           </template>
-          <template slot="caseOverPayment">
-            <el-input
-              placeholder="请输入"
-              clearable
-              v-model="form.caseOverPayment"
-              @change="caseOverPaymentChange"
-              v-input-limit="2"
-              :disabled="dataList.length == 0"
-            ></el-input>
-          </template>
         </avue-crud>
       </basic-container>
       <el-dialog
@@ -217,35 +217,37 @@
           labelWidth: 100,
           column: [
             {
-              label: '系统号',
-              prop: 'sysNo',
-              span: 8,
-              disabled: true
-            },{
-              label: '合同号',
-              prop: 'srcOrderno',
+              label: '所属公司',
+              prop: 'salesCompany',
+              sort:true,
               span: 8,
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '往来单位',
-              prop: 'corpId',
-              sort:true,
+            },
+            {
+              label: '合同号',
+              prop: 'srcOrderno',
               span: 8,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
+              label: '系统号',
+              prop: 'sysNo',
+              span: 8,
+              disabled: true
+            },
+            {
               label: '银行账号',
               prop: 'accountNo',
               span: 8,
@@ -281,97 +283,97 @@
               ]
             },
             {
-              label: '人民币金额',
-              prop: 'amount',
+              label: '往来单位',
+              prop: 'corpId',
+              sort:true,
               span: 8,
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                  message: ' ',
-                  trigger: 'blur'
-                },
-                {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '外币金额',
-              prop: 'foreignAmount',
+              label: '付款日期',
+              prop: 'settlementDate',
+              format:"yyyy-MM-dd",
+              valueFormat:"yyyy-MM-dd 00:00:00",
               span: 8,
+              type:"date",
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '使用溢付款',
-              prop: 'caseOverPayment',
-              display: false,
+              label: '制单人',
+              prop: 'createUserName',
               span: 8,
+              disabled:true,
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '溢付款余额',
-              prop: 'overPayment',
-              display: false,
-              disabled: true,
+              label: '人民币金额',
+              prop: 'amount',
               span: 8,
               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: 'salesCompany',
-              sort:true,
+              label: '外币金额',
+              prop: 'foreignAmount',
               span: 8,
               rules: [
                 {
-                  required: true,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '付款日期',
-              prop: 'settlementDate',
-              format:"yyyy-MM-dd",
-              valueFormat:"yyyy-MM-dd 00:00:00",
+              label: '使用溢付款',
+              prop: 'caseOverPayment',
+              display: false,
               span: 8,
-              type:"date",
               rules: [
                 {
-                  required: true,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '溢付款余额',
+              prop: 'overPayment',
+              display: false,
+              disabled: true,
               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'
                 }

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -221,35 +221,37 @@
           labelWidth: 100,
           column: [
             {
-              label: '系统号',
-              prop: 'sysNo',
-              span: 8,
-              disabled: true
-            },{
-              label: '合同号',
-              prop: 'srcOrderno',
+              label: '所属公司',
+              prop: 'salesCompany',
+              sort:true,
               span: 8,
               rules: [
                 {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '往来单位',
-              prop: 'corpId',
-              sort:true,
+            },
+            {
+              label: '合同号',
+              prop: 'srcOrderno',
               span: 8,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
+              label: '系统号',
+              prop: 'sysNo',
+              span: 8,
+              disabled: true
+            },
+            {
               label: '银行账号',
               prop: 'accountNo',
               span: 8,
@@ -285,103 +287,104 @@
               ]
             },
             {
-              label: '人民币金额',
-              prop: 'amount',
+              label: '往来单位',
+              prop: 'corpId',
+              sort:true,
               span: 8,
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                  message: ' ',
-                  trigger: 'blur'
-                },
-                {
-                  required: false,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '外币金额',
-              prop: 'foreignAmount',
-              display: true,
+              label: '收款日期',
+              prop: 'settlementDate',
+              format:"yyyy-MM-dd",
+              valueFormat:"yyyy-MM-dd 00:00:00",
               span: 8,
+              type:"date",
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '使用溢付款',
-              prop: 'caseOverPayment',
-              display: false,
+              label: '制单人',
+              prop: 'createUserName',
               span: 8,
+              disabled:true,
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '溢付款余额',
-              prop: 'overPayment',
-              display: false,
-              disabled: true,
+              label: '人民币金额',
+              prop: 'amount',
               span: 8,
               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: 'salesCompany',
-              sort:true,
+              label: '外币金额',
+              prop: 'foreignAmount',
+              display: true,
               span: 8,
               rules: [
                 {
-                  required: true,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '收款日期',
-              prop: 'settlementDate',
-              format:"yyyy-MM-dd",
-              valueFormat:"yyyy-MM-dd 00:00:00",
+              label: '使用溢付款',
+              prop: 'caseOverPayment',
+              display: false,
               span: 8,
-              type:"date",
               rules: [
                 {
-                  required: true,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
             },
             {
-              label: '制单人',
-              prop: 'createUserName',
+              label: '溢付款余额',
+              prop: 'overPayment',
+              display: false,
+              disabled: true,
               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',
               span: 8,