Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-24 1a0b6c69df8bafa8d9c612a5ea04a34be712001c

 src/views/system/calculate/record/index.vue

@@ -159,7 +159,7 @@
</template>

<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/platform/calculate-record";
import { getCalculateRecords, getCalculateRecordById,deleteCalculateRecordByIds, addCalculateRecord, editCalculateRecord } from "@/api/platform/calculate-record";
import {unitSelect} from "@/api/platform/unit";
export default {
  name: "Record",
@@ -218,7 +218,7 @@
    /** 查询核算记录列表 */
    getList() {
      this.loading = true;
      listRecord(this.queryParams).then(response => {
      getCalculateRecords(this.queryParams).then(response => {
        this.recordList = response.rows;
        this.total = response.total;
        this.loading = false;
@@ -268,7 +268,7 @@
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      getRecord(id).then(response => {
      getCalculateRecordById(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改核算记录";
@@ -279,13 +279,13 @@
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updateRecord(this.form).then(response => {
            editCalculateRecord(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addRecord(this.form).then(response => {
            addCalculateRecord(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
@@ -298,7 +298,7 @@
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除核算记录编号为"' + ids + '"的数据项？').then(function() {
        return delRecord(ids);
        return deleteCalculateRecordByIds(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");