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

gaoluyang

18 小时以前 a5f10944640d449e9d70367ca571af5cb2c4ffa2

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

# Conflicts:
#	src/views/salesManagement/invoiceLedger/index.vue

 src/views/reportAnalysis/taxComparison/index.vue

@@ -4,7 +4,7 @@
      <el-form-item label="日期">
        <el-date-picker
          style="width: 240px"
          v-model="filters.dateRange"
          v-model="filters.month"
          value-format="YYYY-MM"
          format="YYYY-MM"
          type="month"
@@ -55,7 +55,7 @@
} = usePaginationApi(
  getTaxList,
  {
    dateRange: [], // 来票日期
    month: [], // 来票日期
  },
  [
    {

 src/views/salesManagement/invoiceLedger/index.vue

@@ -85,8 +85,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="发票金额(元)：" prop="invoiceTotal">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.invoiceTotal" placeholder="请输入" clearable :precision="2"/>
            <el-form-item :label="`发票金额(元)： 合同总额(${form.taxInclusiveTotalPrice}元)`" prop="invoiceTotal">
              <el-input-number :step="0.01" :min="0" :max="form.taxInclusiveTotalPrice" style="width: 100%" v-model="form.invoiceTotal" placeholder="请输入" clearable :precision="2"/>
            </el-form-item>
          </el-col>
        </el-row>

 src/views/salesManagement/salesLedger/index.vue

@@ -171,7 +171,7 @@
          <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
          <el-table-column fixed="right" label="操作" min-width="60" align="center" v-if="operationType !== 'view'">
            <template #default="scope">
              <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row)">编辑</el-button>
              <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row,scope.$index)">编辑</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -663,13 +663,16 @@
  proxy.resetForm("formRef");
  dialogFormVisible.value = false;
};

const productIndex = ref(0);
// 打开产品弹框
const openProductForm = (type, row) => {
const openProductForm = (type, row,index) => {
  productOperationType.value = type;
  productForm.value = {};
  proxy.resetForm("productFormRef");
  if (type === "edit") {
    productForm.value = { ...row };
    productIndex.value = index;
  }
  productFormVisible.value = true;
  getProductOptions();
@@ -681,7 +684,11 @@
      if (operationType.value === "edit") {
        submitProductEdit();
      } else {
        if(productOperationType.value === "add"){
        productData.value.push({ ...productForm.value });
        }else{
          productData.value[productIndex.value] = { ...productForm.value }
        }
        closeProductDia();
      }
    }