diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue
index 0a8142d4..49022e3b 100644
--- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue
@@ -652,8 +652,15 @@
         max-height="250"
       >
         <el-table-column prop="name" label="姓名" />
+        <el-table-column prop="nativePlace" label="籍贯" />
         <el-table-column prop="idNo" label="身份证号码" />
         <el-table-column prop="phone" label="手机号" />
+
+        <el-table-column prop="politicalAffiliation" label="政治面貌" />
+        <el-table-column prop="belowUnit" label="所属单位" />
+
+        <el-table-column prop="admissionTime" label="进场日期" />
+        <el-table-column prop="exitTime" label="退场日期" />
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitTemplate">确 定</el-button>
@@ -938,9 +945,15 @@ export default {
           this.da.map((v) => {
             console.log(7777, v);
             let obj = {};
-            obj.idNo = v["身份证"]; //ip是表的标题
-            obj.name = v["姓名"]; //ip是表的标题
-            obj.phone = v["手机号"]; //ip是表的标题
+            obj.idNo = v["身份证(必填)"]; //ip是表的标题
+            obj.name = v["姓名(必填)"]; //ip是表的标题
+            obj.phone = v["手机号(必填)"]; //ip是表的标题
+
+            obj.nativePlace = v["籍贯"]; //ip是表的标题
+            obj.politicalAffiliation = v["政治面貌"]; //ip是表的标题
+            obj.belowUnit = v["所属单位"]; //ip是表的标题
+            obj.admissionTime = _this.parseTime(v["进场日期"], "{y}-{m}-{d}"); //ip是表的标题
+            obj.exitTime = _this.parseTime(v["退场日期"], "{y}-{m}-{d}"); //ip是表的标题
             if (obj.idNo && obj.name && obj.phone) {
               successNo += 1;
               arr.push(obj);
diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount copy.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount copy.vue
new file mode 100644
index 00000000..ea6f56c0
--- /dev/null
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount copy.vue	
@@ -0,0 +1,741 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="专用账号" prop="dedicatedAccounts">
+        <el-input
+          v-model="queryParams.data.dedicatedAccounts"
+          placeholder="请输入专用账号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="开户日期" prop="accountsTime">
+        <el-date-picker
+          clearable
+          size="small"
+          style="width: 200px"
+          v-model="queryParams.data.accountsTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开户日期"
+          @change="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <!-- <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        > -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['build:gzzyzh:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['build:gzzyzh:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['build:gzzyzh:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['build:gzzyzh:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="gzbzjList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" fixed />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center"
+        fixed
+      />
+      <el-table-column
+        label="专用账号"
+        align="center"
+        prop="dedicatedAccounts"
+        min-width="120"
+      />
+      <el-table-column
+        label="开户日期"
+        align="center"
+        prop="accountsTime"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.accountsTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="开户银行"
+        align="center"
+        prop="bank"
+        min-width="120"
+      />
+      <el-table-column
+        label="人工费拨付日期"
+        align="center"
+        prop="yearMonthDate"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.yearMonthDate, "{y}-{m}") }}</span>
+        </template>
+      </el-table-column>
+
+      <!-- <el-table-column
+        label="当月转入专用账户金额（万元）"
+        align="center"
+        prop="monthAmountTransferred"
+        min-width="210"
+      /> -->
+      <el-table-column
+        label="收入金额（万元）"
+        align="center"
+        prop="incomeAmount"
+        min-width="150"
+      />
+      <el-table-column
+        label="收入时间"
+        align="center"
+        prop="incomeDate"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.incomeDate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="支出金额（万元）"
+        align="center"
+        prop="transferAmount"
+        min-width="150"
+      />
+      <el-table-column
+        label="支出时间"
+        align="center"
+        prop="transferTime"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.transferTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="转账凭证"
+        align="center"
+        prop="proofTransfer"
+        min-width="120"
+      />
+
+      <el-table-column
+        label="账户余额（万元）"
+        align="center"
+        prop="balance"
+        min-width="150"
+      />
+      <el-table-column
+        label="三方协议"
+        align="center"
+        prop="attachment"
+        min-width="120"
+      >
+        <template slot="header">
+          三方协议
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="施工单位、建设单位、开户银行签订资金管理三方协议"
+            placement="top"
+          >
+            <i class="el-icon-info"></i>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in JSON.parse(
+              scope.row.attachment ? scope.row.attachment : JSON.stringify({})
+            )"
+            :key="item + index"
+          >
+            <i class="el-icon-document"></i>
+            {{ item.name }}
+            <i
+              class="el-icon-download"
+              @click="$myDownLoadFile(item)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="180"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['build:gzzyzh:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['build:gzzyzh:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改农民工工资专用账户对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-form-item label="人工费拨付日期" prop="yearMonthDate">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="form.yearMonthDate"
+            type="month"
+            value-format="yyyy-MM-dd"
+            placeholder="选择人工费拨付日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="专用账号" prop="dedicatedAccounts">
+          <el-input
+            v-model="form.dedicatedAccounts"
+            placeholder="请输入专用账号"
+          />
+        </el-form-item>
+        <el-form-item label="开户日期" prop="accountsTime">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="form.accountsTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开户日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="开户银行" prop="bank">
+          <el-input v-model="form.bank" placeholder="请输入开户银行" />
+        </el-form-item>
+        <!-- <el-form-item
+          label="当月转入专用账户金额"
+          prop="monthAmountTransferred"
+        >
+          <el-input
+            v-model="form.monthAmountTransferred"
+            placeholder="请输入当月转入专用账户金额"
+          >
+            <template slot="append">万元</template>
+          </el-input>
+        </el-form-item> -->
+        <el-form-item label="收入金额" prop="incomeAmount">
+          <el-input v-model="form.incomeAmount" placeholder="请输入收入金额">
+            <template slot="append">万元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="收入时间" prop="incomeDate">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="form.incomeDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择收入时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="支出金额" prop="transferAmount">
+          <el-input v-model="form.transferAmount" placeholder="请输入支出金额">
+            <template slot="append">万元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="支出时间" prop="transferTime">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="form.transferTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择支出时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="转账凭证" prop="proofTransfer">
+          <el-input v-model="form.proofTransfer" placeholder="请输入转账凭证" />
+        </el-form-item>
+
+        <el-form-item label="账户余额" prop="balance">
+          <el-input
+            v-model="form.balance"
+            placeholder="请输入账户余额"
+            readonly
+          >
+            <template slot="append">万元</template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item prop="attachment">
+          <template slot="label">
+            <span>三方协议</span>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="施工单位、建设单位、开户银行签订资金管理三方协议"
+              placement="top"
+            >
+              <i class="el-icon-info"></i>
+            </el-tooltip>
+          </template>
+          <myUpload :fileList="fileList" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <template>
+          <el-popconfirm
+            title="保存后，不可修改，请核对好数据"
+            @confirm="submitForm"
+          >
+            <el-button
+              slot="reference"
+              type="primary"
+              style="margin-right: 10px"
+              >确 定</el-button
+            >
+          </el-popconfirm>
+        </template> -->
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listGzbzj,
+  getGzbzj,
+  delGzbzj,
+  addGzbzj,
+  updateGzbzj,
+  exportGzbzj,
+} from "@/api/build/gzbzj";
+
+export default {
+  name: "Gzbzj",
+  props: ["proNo", "proCode"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 农民工工资专用账户表格数据
+      gzbzjList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          updateTime: null,
+          updateUid: null,
+          createTime: null,
+          createUid: null,
+          proNo: null,
+          projectCode: null,
+          remark: null,
+          dedicatedAccounts: null,
+          accountsTime: null,
+          bank: null,
+          monthAmountTransferred: null,
+          proofTransfer: null,
+          transferTime: null,
+          transferAmount: null,
+          balance: null,
+          incomeDate: null,
+          incomeAmount: null,
+          attachment: null,
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dedicatedAccounts: [
+          {
+            required: true,
+            message: "请输入专用账户",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        bank: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        monthAmountTransferred: [
+          {
+            required: true,
+            message: "请输入当月转入专用账户金额",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+        incomeAmount: [
+          {
+            required: true,
+            message: "请输入收入金额",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+        transferAmount: [
+          {
+            required: true,
+            message: "请输入支出金额",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+      },
+      fileList: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    amountList() {
+      const { incomeAmount, transferAmount } = this.form;
+      return {
+        incomeAmount,
+        transferAmount,
+      };
+    },
+  },
+  watch: {
+    amountList: function (n, o) {
+      if (this.form.incomeAmount || this.form.transferAmount) {
+        this.form.balance = n.incomeAmount - n.transferAmount;
+      }
+    },
+  },
+  methods: {
+    /** 查询农民工工资专用账户列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.data.proNo = this.proNo;
+      this.queryParams.data.proCode = this.proCode;
+      listGzbzj(this.queryParams).then((response) => {
+        this.gzbzjList = response.records;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        updateTime: null,
+        updateUid: null,
+        createTime: null,
+        createUid: null,
+        proNo: null,
+        projectCode: null,
+        remark: null,
+        dedicatedAccounts: null,
+        accountsTime: null,
+        bank: null,
+        monthAmountTransferred: null,
+        proofTransfer: null,
+        transferTime: null,
+        transferAmount: null,
+        balance: null,
+        incomeDate: null,
+        incomeAmount: null,
+        attachment: null,
+      };
+      this.resetForm("form");
+    },
+    // 查询表单重置
+    resetQueryForm() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          id: null,
+          updateTime: null,
+          updateUid: null,
+          createTime: null,
+          createUid: null,
+          proNo: null,
+          projectCode: null,
+          remark: null,
+          dedicatedAccounts: null,
+          accountsTime: null,
+          bank: null,
+          monthAmountTransferred: null,
+          proofTransfer: null,
+          transferTime: null,
+          transferAmount: null,
+          balance: null,
+          incomeDate: null,
+          incomeAmount: null,
+          attachment: null,
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetQueryForm();
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加农民工工资专用账户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getGzbzj(id).then((response) => {
+        this.form = response.data;
+        if (this.form.attchment) {
+          this.fileList = JSON.parse(this.form.attachment);
+        }
+        this.open = true;
+        this.title = "修改农民工工资专用账户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.form.attachment =
+        this.fileList.length > 0 ? JSON.stringify(this.fileList) : null;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGzbzj(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            this.form.proNo = this.proNo;
+            this.form.proCode = this.proCode;
+            addGzbzj(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      if (ids) {
+        this.$confirm("是否删除选中的数据？", "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(function () {
+            return delGzbzj(ids);
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("删除成功");
+          })
+          .catch(function () {});
+      } else {
+        this.$message.warning("请选择要删除的数据！！");
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      let message = "是否确认导出所有的数据项?";
+      if (this.ids) {
+        message = "是否确认导出选中的数据项?";
+        queryParams.ids = this.ids;
+      }
+      this.$confirm(message, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportGzbzj(queryParams);
+        })
+        .then((response) => {
+          this.downloadFile(response, true, response.msg);
+          // this.download(response.msg);
+        })
+        .catch(function () {});
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/css/dialog.scss";
+//::v-deep {
+//   .el-dialog {
+//       margin-top: 10vh !important;
+//    }
+//}
+</style>
diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue
index a3a8a1d6..a4f91c03 100644
--- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue
@@ -6,10 +6,10 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="专用账号" prop="dedicatedAccounts">
+      <el-form-item label="专用账户" prop="dedicatedAccounts">
         <el-input
           v-model="queryParams.data.dedicatedAccounts"
-          placeholder="请输入专用账号"
+          placeholder="请输入专用账户"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -23,19 +23,37 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item label="开户日期" prop="accountsTime">
+      <el-form-item label="账户开设时间" prop="accountsTime">
         <el-date-picker
           clearable
           size="small"
           style="width: 200px"
-          v-model="queryParams.data.accountsTime"
+          v-model="queryParams.accountsTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择开户日期"
+          placeholder="选择账户开设时间"
           @change="handleQuery"
         >
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="是否撤销" prop="status">
+        <el-select
+          v-model="queryParams.data.status"
+          placeholder="请选择是否撤销"
+          clearable
+          size="small"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <!-- <el-button
           type="cyan"
@@ -57,7 +75,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['build:gzzyzh:add']"
+          v-hasPermi="['build:account:add']"
           >新增</el-button
         >
       </el-col>
@@ -68,7 +86,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['build:gzzyzh:edit']"
+          v-hasPermi="['build:account:edit']"
           >修改</el-button
         >
       </el-col>
@@ -79,20 +97,10 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['build:gzzyzh:remove']"
+          v-hasPermi="['build:account:remove']"
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['build:gzzyzh:export']"
-          >导出</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -101,35 +109,161 @@
 
     <el-table
       v-loading="loading"
-      :data="gzbzjList"
+      :data="accountList"
       @selection-change="handleSelectionChange"
+      row-key="id"
+      :expand-row-keys="expands"
+      :tree-props="{ children: 'noChildren', hasChildren: 'hasChildren' }"
     >
-      <el-table-column type="selection" width="55" align="center" fixed />
-      <el-table-column
-        label="序号"
-        type="index"
-        width="50"
-        align="center"
-        fixed
-      />
-      <el-table-column
-        label="人工费拨付日期"
-        align="center"
-        prop="yearMonthDate"
-        min-width="120"
       >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.yearMonthDate, "{y}-{m}") }}</span>
+      <el-table-column type="expand" prop="children">
+        <template slot-scope="props">
+          <el-table v-loading="loading" :data="props.row.children">
+            <el-table-column
+              label="序号"
+              type="index"
+              width="150"
+              align="center"
+              fixed
+            />
+            <el-table-column
+              label="人工费拨付日期"
+              align="center"
+              prop="yearMonthDate"
+              min-width="120"
+            >
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.yearMonthDate, "{y}-{m}") }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="收入金额（万元）"
+              align="center"
+              prop="incomeAmount"
+              min-width="150"
+            />
+            <el-table-column
+              label="收入时间"
+              align="center"
+              prop="incomeDate"
+              min-width="120"
+            >
+              <template slot-scope="scope">
+                <span>{{
+                  parseTime(scope.row.incomeDate, "{y}-{m}-{d}")
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="支出金额（万元）"
+              align="center"
+              prop="transferAmount"
+              min-width="150"
+            />
+            <el-table-column
+              label="支出时间"
+              align="center"
+              prop="transferTime"
+              min-width="120"
+            >
+              <template slot-scope="scope">
+                <span>{{
+                  parseTime(scope.row.transferTime, "{y}-{m}-{d}")
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="转账凭证"
+              align="center"
+              prop="proofTransfer"
+              min-width="120"
+            />
+
+            <el-table-column
+              label="账户余额（万元）"
+              align="center"
+              prop="balance"
+              min-width="150"
+            />
+            <el-table-column
+              label="三方协议"
+              align="center"
+              prop="attachment"
+              min-width="120"
+            >
+              <template slot="header">
+                三方协议
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="施工单位、建设单位、开户银行签订资金管理三方协议"
+                  placement="top"
+                >
+                  <i class="el-icon-info"></i>
+                </el-tooltip>
+              </template>
+              <template slot-scope="scope">
+                <div
+                  v-for="(item, index) in JSON.parse(
+                    scope.row.attachment
+                      ? scope.row.attachment
+                      : JSON.stringify({})
+                  )"
+                  :key="item + index"
+                >
+                  <i class="el-icon-document"></i>
+                  {{ item.name }}
+                  <i
+                    class="el-icon-download"
+                    @click="$myDownLoadFile(item)"
+                    style="cursor: pointer"
+                  ></i>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              width="270"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdateRecord(scope.row)"
+                  v-hasPermi="['build:gzzyzh:edit']"
+                  :disabled="props.row.status == '1'"
+                  >修改</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDeleteRecord(scope.row)"
+                  v-hasPermi="['build:gzzyzh:remove']"
+                  :disabled="props.row.status == '1'"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
         </template>
       </el-table-column>
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="序号" type="index" width="50" align="center" />
+
       <el-table-column
-        label="专用账号"
+        label="专用账户"
         align="center"
         prop="dedicatedAccounts"
         min-width="120"
       />
       <el-table-column
-        label="开户日期"
+        label="账户开设时间"
         align="center"
         prop="accountsTime"
         min-width="120"
@@ -139,101 +273,54 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="开户银行"
+        label="开户行"
         align="center"
         prop="bank"
         min-width="120"
       />
-      <!-- <el-table-column
-        label="当月转入专用账户金额（万元）"
-        align="center"
-        prop="monthAmountTransferred"
-        min-width="210"
-      /> -->
-      <el-table-column
-        label="收入金额（万元）"
-        align="center"
-        prop="incomeAmount"
-        min-width="150"
-      />
       <el-table-column
-        label="收入时间"
+        label="是否撤销"
         align="center"
-        prop="incomeDate"
+        prop="status"
+        :formatter="statusFormat"
         min-width="120"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.incomeDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="支出金额（万元）"
-        align="center"
-        prop="transferAmount"
-        min-width="150"
       />
-      <el-table-column
-        label="支出时间"
+      <!-- <el-table-column
+        label="撤销时间"
         align="center"
-        prop="transferTime"
+        prop="cancellationTime"
         min-width="120"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.transferTime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.cancellationTime, "{y}-{m}-{d}")
+          }}</span>
         </template>
-      </el-table-column>
-      <el-table-column
-        label="转账凭证"
-        align="center"
-        prop="proofTransfer"
-        min-width="120"
-      />
-
-      <el-table-column
-        label="账户余额（万元）"
-        align="center"
-        prop="balance"
-        min-width="150"
-      />
-      <el-table-column
-        label="三方协议"
+      </el-table-column> -->
+      <!-- <el-table-column
+        label="总包单位无拖欠农民工工资承诺书"
         align="center"
-        prop="attachment"
+        prop="commitmentLetter"
         min-width="120"
       >
         <template slot="header">
-          三方协议
+          承诺书
           <el-tooltip
             class="item"
             effect="dark"
-            content="施工单位、建设单位、开户银行签订资金管理三方协议"
+            content="总包单位无拖欠农民工工资承诺书"
             placement="top"
           >
             <i class="el-icon-info"></i>
           </el-tooltip>
         </template>
-        <template slot-scope="scope">
-          <div
-            v-for="(item, index) in JSON.parse(
-              scope.row.attachment ? scope.row.attachment : JSON.stringify({})
-            )"
-            :key="item + index"
-          >
-            <i class="el-icon-document"></i>
-            {{ item.name }}
-            <i
-              class="el-icon-download"
-              @click="$myDownLoadFile(item)"
-              style="cursor: pointer"
-            ></i>
-          </div>
-        </template>
-      </el-table-column>
+      </el-table-column> -->
+
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="180"
+        width="270"
         fixed="right"
       >
         <template slot-scope="scope">
@@ -242,15 +329,33 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['build:gzzyzh:edit']"
+            v-hasPermi="['build:account:edit']"
+            :disabled="scope.row.status == '1'"
             >修改</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAddRecord(scope.row)"
+            v-hasPermi="['build:account:addRecord']"
+            :disabled="scope.row.status == '1'"
+            >新增记录</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-delete"
+            @click="handleCancel(scope.row)"
+            v-hasPermi="['build:account:cancel']"
+            >{{ scope.row.status == "0" ? "撤销" : "已撤销" }}</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['build:gzzyzh:remove']"
+            v-hasPermi="['build:account:remove']"
             >删除</el-button
           >
         </template>
@@ -273,53 +378,158 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-form-item label="人工费拨付日期" prop="yearMonthDate">
+      <el-form ref="form" :model="form" :rules="rules" label-width="124px">
+        <el-form-item label="专用账户" prop="dedicatedAccounts">
+          <el-input
+            v-model="form.dedicatedAccounts"
+            placeholder="请输入专用账户"
+            :disabled="isCancel"
+          />
+        </el-form-item>
+        <el-form-item label="账户开设时间" prop="accountsTime">
           <el-date-picker
             clearable
             size="small"
             style="width: 100%"
-            v-model="form.yearMonthDate"
-            type="month"
+            v-model="form.accountsTime"
+            type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择人工费拨付日期"
+            placeholder="选择账户开设时间"
+            :disabled="isCancel"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="专用账号" prop="dedicatedAccounts">
+        <el-form-item label="开户行" prop="bank">
           <el-input
-            v-model="form.dedicatedAccounts"
-            placeholder="请输入专用账号"
+            v-model="form.bank"
+            placeholder="请输入开户行"
+            :disabled="isCancel"
           />
         </el-form-item>
-        <el-form-item label="开户日期" prop="accountsTime">
+
+        <el-form-item label="撤销时间" prop="cancellationTime" v-if="isCancel">
           <el-date-picker
             clearable
             size="small"
             style="width: 100%"
-            v-model="form.accountsTime"
+            v-model="form.cancellationTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择开户日期"
+            placeholder="选择撤销时间"
+            :disabled="form.status == '1'"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="开户银行" prop="bank">
-          <el-input v-model="form.bank" placeholder="请输入开户银行" />
+        <el-form-item
+          label="总包单位无拖欠农民工工资承诺书"
+          prop="commitmentLetter"
+          v-if="isCancel && form.status == '0'"
+        >
+          <template slot="label">
+            <span>承诺书</span>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="总包单位无拖欠农民工工资承诺书"
+              placement="top"
+            >
+              <i class="el-icon-info"></i>
+            </el-tooltip>
+          </template>
+          <myUpload :fileList="fileList" />
         </el-form-item>
-        <!-- <el-form-item
-          label="当月转入专用账户金额"
-          prop="monthAmountTransferred"
+
+        <el-form-item
+          label="总包单位无拖欠农民工工资承诺书"
+          prop="commitmentLetter"
+          v-if="isCancel && form.status == '1'"
         >
-          <el-input
-            v-model="form.monthAmountTransferred"
-            placeholder="请输入当月转入专用账户金额"
+          <template slot="label">
+            <span>承诺书</span>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="总包单位无拖欠农民工工资承诺书"
+              placement="top"
+            >
+              <i class="el-icon-info"></i>
+            </el-tooltip>
+          </template>
+          <template v-if="form.commitmentLetter">
+            <div
+              v-for="(item, index) in JSON.parse(form.commitmentLetter)"
+              :key="item + index"
+            >
+              {{ item.name }}
+
+              <i
+                class="el-icon-download"
+                @click="$myDownLoadFile(item, index)"
+                style="cursor: pointer"
+              ></i>
+            </div>
+          </template>
+        </el-form-item>
+
+        <!-- <el-form-item label="是否撤销" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="请选择是否撤销"
+            style="width: 100%"
           >
-            <template slot="append">万元</template>
-          </el-input>
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改专用账户转账记录 -->
+    <el-dialog
+      :title="recordTitle"
+      :visible.sync="recordOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      @close="recordClose"
+    >
+      <el-form
+        ref="recordForm"
+        :model="recordForm"
+        :rules="recordRules"
+        label-width="180px"
+      >
+        <el-form-item label="人工费拨付日期" prop="yearMonthDate">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="recordForm.yearMonthDate"
+            type="month"
+            value-format="yyyy-MM-dd"
+            placeholder="选择人工费拨付日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="专用账号" prop="dedicatedAccounts">
+          <el-input
+            v-model="recordForm.dedicatedAccounts"
+            placeholder="请输入专用账号"
+          />
         </el-form-item> -->
         <el-form-item label="收入金额" prop="incomeAmount">
-          <el-input v-model="form.incomeAmount" placeholder="请输入收入金额">
+          <el-input
+            v-model="recordForm.incomeAmount"
+            placeholder="请输入收入金额"
+          >
             <template slot="append">万元</template>
           </el-input>
         </el-form-item>
@@ -328,7 +538,7 @@
             clearable
             size="small"
             style="width: 100%"
-            v-model="form.incomeDate"
+            v-model="recordForm.incomeDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择收入时间"
@@ -336,7 +546,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="支出金额" prop="transferAmount">
-          <el-input v-model="form.transferAmount" placeholder="请输入支出金额">
+          <el-input
+            v-model="recordForm.transferAmount"
+            placeholder="请输入支出金额"
+          >
             <template slot="append">万元</template>
           </el-input>
         </el-form-item>
@@ -345,7 +558,7 @@
             clearable
             size="small"
             style="width: 100%"
-            v-model="form.transferTime"
+            v-model="recordForm.transferTime"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择支出时间"
@@ -353,12 +566,15 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="转账凭证" prop="proofTransfer">
-          <el-input v-model="form.proofTransfer" placeholder="请输入转账凭证" />
+          <el-input
+            v-model="recordForm.proofTransfer"
+            placeholder="请输入转账凭证"
+          />
         </el-form-item>
 
         <el-form-item label="账户余额" prop="balance">
           <el-input
-            v-model="form.balance"
+            v-model="recordForm.balance"
             placeholder="请输入账户余额"
             readonly
           >
@@ -378,42 +594,36 @@
               <i class="el-icon-info"></i>
             </el-tooltip>
           </template>
-          <myUpload :fileList="fileList" />
+          <myUpload :fileList="recordFileList" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <template>
-          <el-popconfirm
-            title="保存后，不可修改，请核对好数据"
-            @confirm="submitForm"
-          >
-            <el-button
-              slot="reference"
-              type="primary"
-              style="margin-right: 10px"
-              >确 定</el-button
-            >
-          </el-popconfirm>
-        </template> -->
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="recordSubmitForm">确 定</el-button>
+        <el-button @click="recordCancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import {
+  listAccount,
+  getAccount,
+  delAccount,
+  addAccount,
+  updateAccount,
+  exportAccount,
+} from "@/api/build/account";
 import {
   listGzbzj,
   getGzbzj,
   delGzbzj,
   addGzbzj,
   updateGzbzj,
-  exportGzbzj,
 } from "@/api/build/gzbzj";
 
 export default {
-  name: "Gzbzj",
+  name: "Account",
   props: ["proNo", "proCode"],
   data() {
     return {
@@ -430,35 +640,31 @@ export default {
       // 总条数
       total: 0,
       // 农民工工资专用账户表格数据
-      gzbzjList: [],
+      accountList: [],
       // 弹出层标题
       title: "",
+      recordTitle: "",
       // 是否显示弹出层
       open: false,
+      recordOpen: false,
+      // 是否撤销字典
+      statusOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         ids: null,
         data: {
-          updateTime: null,
-          updateUid: null,
-          createTime: null,
-          createUid: null,
           proNo: null,
-          projectCode: null,
-          remark: null,
+          proCode: null,
           dedicatedAccounts: null,
           accountsTime: null,
           bank: null,
-          monthAmountTransferred: null,
-          proofTransfer: null,
-          transferTime: null,
-          transferAmount: null,
-          balance: null,
-          incomeDate: null,
-          incomeAmount: null,
-          attachment: null,
+          status: null,
+          cancellationTime: null,
+          commitmentLetter: null,
+          createUid: null,
+          updateUid: null,
         },
         // 排序方式
         params: {
@@ -472,6 +678,32 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        dedicatedAccounts: [
+          { required: true, message: "请输入专用账户", trigger: "blur" },
+        ],
+        accountsTime: [
+          { required: true, message: "选择账户开设时间", trigger: "change" },
+        ],
+        bank: [{ required: true, message: "请输入开户行", trigger: "blur" }],
+        cancellationTime: [
+          { required: true, message: "请选择撤销时间", trigger: "change" },
+        ],
+        commitmentLetter: [
+          { required: true, message: "请上传承诺书", trigger: "change" },
+        ],
+      },
+      fileList: [],
+      isCancel: false,
+      gzbzjList: [],
+      recordForm: {},
+      recordRules: {
+        yearMonthDate: [
+          {
+            required: true,
+            message: "请选择人工费拨付日期",
+            trigger: "change",
+          },
+        ],
         dedicatedAccounts: [
           {
             required: true,
@@ -521,15 +753,19 @@ export default {
           },
         ],
       },
-      fileList: [],
+      recordFileList: [],
+      expands: [],
     };
   },
   created() {
     this.getList();
+    this.getDicts("whether").then((response) => {
+      this.statusOptions = response.data;
+    });
   },
   computed: {
     amountList() {
-      const { incomeAmount, transferAmount } = this.form;
+      const { incomeAmount, transferAmount } = this.recordForm;
       return {
         incomeAmount,
         transferAmount,
@@ -538,23 +774,81 @@ export default {
   },
   watch: {
     amountList: function (n, o) {
-      if (this.form.incomeAmount || this.form.transferAmount) {
-        this.form.balance = n.incomeAmount - n.transferAmount;
+      if (this.recordForm.incomeAmount || this.recordForm.transferAmount) {
+        this.recordForm.balance =
+          (n.incomeAmount ? n.incomeAmount : 0) -
+          (n.transferAmount ? n.transferAmount : 0);
       }
     },
   },
   methods: {
+    handleAddRecord(row) {
+      this.recordOpen = true;
+      this.recordTitle = "添加专用账户转账记录";
+      this.recordForm.dedicatedAccounts = row.id;
+    },
+    handleUpdateRecord(row) {
+      const id = row.id || this.ids;
+      getGzbzj(id).then((response) => {
+        this.recordForm = response.data;
+        if (this.recordForm.attchment) {
+          this.recordFileList = JSON.parse(this.recordForm.attachment);
+        }
+        this.recordOpen = true;
+        this.recordTitle = "修改专用账户转账记录";
+      });
+    },
+    recordSubmitForm() {
+      this.recordForm.attachment =
+        this.recordFileList.length > 0
+          ? JSON.stringify(this.recordFileList)
+          : null;
+      this.$refs["recordForm"].validate((valid) => {
+        if (valid) {
+          if (this.recordForm.id != null) {
+            updateGzbzj(this.recordForm).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.recordOpen = false;
+                this.getList();
+              }
+            });
+          } else {
+            this.recordForm.proNo = this.proNo;
+            this.recordForm.proCode = this.proCode;
+            addGzbzj(this.recordForm).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.recordOpen = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    recordCancel() {
+      this.recordOpen = false;
+    },
+    recordClose() {
+      this.recordForm = {};
+    },
+    handleDeleteRecord() {},
     /** 查询农民工工资专用账户列表 */
     getList() {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
       this.queryParams.data.proCode = this.proCode;
-      listGzbzj(this.queryParams).then((response) => {
-        this.gzbzjList = response.records;
+      listAccount(this.queryParams).then((response) => {
+        this.accountList = response.records;
         this.total = response.total;
         this.loading = false;
       });
     },
+    // 是否撤销字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -562,26 +856,23 @@ export default {
     },
     // 表单重置
     reset() {
+      this.isCancel = false;
+      this.fileList = [];
       this.form = {
         id: null,
-        updateTime: null,
-        updateUid: null,
-        createTime: null,
-        createUid: null,
         proNo: null,
-        projectCode: null,
-        remark: null,
+        proCode: null,
         dedicatedAccounts: null,
         accountsTime: null,
         bank: null,
-        monthAmountTransferred: null,
-        proofTransfer: null,
-        transferTime: null,
-        transferAmount: null,
-        balance: null,
-        incomeDate: null,
-        incomeAmount: null,
-        attachment: null,
+        status: null,
+        cancellationTime: null,
+        commitmentLetter: null,
+        createUid: null,
+        createTime: null,
+        updateUid: null,
+        updateTime: null,
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -592,24 +883,19 @@ export default {
         pageSize: 10,
         data: {
           id: null,
-          updateTime: null,
-          updateUid: null,
-          createTime: null,
-          createUid: null,
           proNo: null,
-          projectCode: null,
-          remark: null,
+          proCode: null,
           dedicatedAccounts: null,
           accountsTime: null,
           bank: null,
-          monthAmountTransferred: null,
-          proofTransfer: null,
-          transferTime: null,
-          transferAmount: null,
-          balance: null,
-          incomeDate: null,
-          incomeAmount: null,
-          attachment: null,
+          status: null,
+          cancellationTime: null,
+          commitmentLetter: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+          remark: null,
         },
         // 排序方式
         params: {
@@ -647,23 +933,37 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getGzbzj(id).then((response) => {
+      getAccount(id).then((response) => {
         this.form = response.data;
-        if (this.form.attchment) {
-          this.fileList = JSON.parse(this.form, attachment);
-        }
         this.open = true;
         this.title = "修改农民工工资专用账户";
       });
     },
+    // 撤销
+    handleCancel(row) {
+      this.reset();
+      this.isCancel = true;
+      const id = row.id || this.ids;
+      getAccount(id).then((response) => {
+        this.form = response.data;
+        if (this.form.commitmentLetter) {
+          this.fileList = JSON.parse(this.form.commitmentLetter);
+        }
+        this.open = true;
+        this.title = "撤销农民工工资专用账户";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
-      this.form.attachment =
+      this.form.commitmentLetter =
         this.fileList.length > 0 ? JSON.stringify(this.fileList) : null;
+      if (this.isCancel) {
+        this.form.status = "1";
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateGzbzj(this.form).then((response) => {
+            updateAccount(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
@@ -673,7 +973,8 @@ export default {
           } else {
             this.form.proNo = this.proNo;
             this.form.proCode = this.proCode;
-            addGzbzj(this.form).then((response) => {
+            this.form.status = "0";
+            addAccount(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
@@ -694,7 +995,7 @@ export default {
           type: "warning",
         })
           .then(function () {
-            return delGzbzj(ids);
+            return delAccount(ids);
           })
           .then(() => {
             this.getList();
@@ -719,7 +1020,7 @@ export default {
         type: "warning",
       })
         .then(function () {
-          return exportGzbzj(queryParams);
+          return exportAccount(queryParams);
         })
         .then((response) => {
           this.downloadFile(response, true, response.msg);