Merge remote-tracking branch 'origin/dev' into dev

maven

4 天以前 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4

 src/views/procurementManagement/paymentEntry/index.vue

@@ -136,8 +136,6 @@
          <el-col :span="12">
            <el-form-item label="发票金额(元)：" prop="invoiceAmount">
              <el-input
                type="number"
                :step="0.01"
                v-model="form.invoiceAmount"
                placeholder="自动填充"
                clearable
@@ -147,9 +145,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="本次付款金额：" prop="currentPaymentAmount">
              <el-input
                type="number"
                :step="0.01"
              <el-input-number :step="0.01" :min="0" style="width: 100%"
                v-model="form.currentPaymentAmount"
                placeholder="请输入"
                clearable
@@ -245,10 +241,12 @@
  {
    label: "供应商名称",
    prop: "supplierName",
    width:240
  },
  {
    label: "发票号",
    prop: "invoiceNumber",
    width:200
  },
  {
    label: "发票金额(元)",