Merge remote-tracking branch 'origin/master'

jiangping

2024-12-05 16217be9c85f95cb236e639da6e546bb38cdc53d

 admin/src/views/finance/components/flowingWater.vue

@@ -17,10 +17,10 @@
                        <el-form-item label="计费周期" required>
                            <el-input v-model="form.date" disabled placeholder="请输入" v-trim />
                        </el-form-item>
                        <el-form-item label="应收金额" required>
                        <el-form-item :label="`应${form.needReceivableFeeCopy > 0 ? '收' : '付'}金额`" required>
                            <el-input v-model="form.receivableFee" disabled placeholder="请输入" v-trim />
                        </el-form-item>
                        <el-form-item label="实收金额" prop="actReceivableFee">
                        <el-form-item :label="`实${form.needReceivableFeeCopy > 0 ? '收' : '付'}金额`" prop="actReceivableFee">
                            <el-input v-model="form.actReceivableFee" placeholder="请输入" v-trim />
                        </el-form-item>
                        <el-form-item label="入账日期" prop="actPayDate">
@@ -110,7 +110,8 @@
          remark: '',
          accountId: '',
          multifileList: [],
          costTypeName: ''
          costTypeName: '',
          needReceivableFeeCopy: ''
        },
        rules: {
          receivableFee: [