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

gaoluyang

2026-01-09 0a5df5ab2cc2f564ccebb54ec28e0a0b159797bf

 src/views/salesManagement/receiptPayment/index.vue

@@ -71,7 +71,7 @@
        :summary-method="summarizeMainTable"
        :expand-row-keys="expandedRowKeys"
        @expand-change="expandChange"

        stripe
        height="calc(100vh - 21.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
@@ -82,6 +82,7 @@
              border
              show-summary
              :summary-method="summarizeChildrenTable"
              stripe
            >
              <el-table-column
                align="center"
@@ -103,19 +104,12 @@
              </el-table-column>
              <el-table-column label="回款方式" prop="receiptPaymentType">
                <template #default="scope">
                  <el-select
                  <el-input
                    v-model="scope.row.receiptPaymentType"
                    placeholder="请选择"
                    placeholder="请输入"
                    clearable
                    :disabled="!scope.row.editType"
                  >
                    <el-option
                      v-for="item in receipt_payment_type"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    />
                  </el-select>
                  />
                </template>
              </el-table-column>
              <el-table-column label="登记人" prop="registrant" width="90"/>
@@ -315,18 +309,11 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="回款形式：" prop="receiptPaymentType">
              <el-select
              <el-input
                v-model="form.receiptPaymentType"
                placeholder="请选择"
                placeholder="请输入"
                clearable
              >
                <el-option
                  v-for="item in receipt_payment_type"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -433,7 +420,6 @@
});
const { form, rules } = toRefs(data);
const { form: searchForm, resetForm } = useFormData(data.searchForm);
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");

const formattedNumber = (row, column, cellValue) => {
  return parseFloat(cellValue).toFixed(2);