From 58384574cfc565381abdf461c6c277c7a27642cf Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Tue, 23 Apr 2024 16:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jwtech-admin-page/src/api/build/gckzfdb.js | 53 ++
jwtech-admin-page/src/api/build/gzbzj.js | 53 ++
.../peasantWorkerSystem/index.vue | 18 +
.../options/guaranteePaymentProjectFunds.vue | 628 ++++++++++++++++++
.../peasantWorkerSystem/options/payroll.vue | 70 +-
.../options/realNameSystem.vue | 49 +-
.../options/specificMarginAccount.vue | 586 ++++++++++++++++
7 files changed, 1452 insertions(+), 5 deletions(-)
create mode 100644 jwtech-admin-page/src/api/build/gckzfdb.js
create mode 100644 jwtech-admin-page/src/api/build/gzbzj.js
create mode 100644 jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
create mode 100644 jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/specificMarginAccount.vue
diff --git a/jwtech-admin-page/src/api/build/gckzfdb.js b/jwtech-admin-page/src/api/build/gckzfdb.js
new file mode 100644
index 00000000..2cc49deb
--- /dev/null
+++ b/jwtech-admin-page/src/api/build/gckzfdb.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询工程款支付担保列表
+export function listGckzfdb(query) {
+ return request({
+ url: '/system/gckzfdb/list',
+ method: 'post',
+ data: query
+ })
+}
+
+// 查询工程款支付担保详细
+export function getGckzfdb(id) {
+ return request({
+ url: '/system/gckzfdb/' + id,
+ method: 'get'
+ })
+}
+
+// 新增工程款支付担保
+export function addGckzfdb(data) {
+ return request({
+ url: '/system/gckzfdb',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改工程款支付担保
+export function updateGckzfdb(data) {
+ return request({
+ url: '/system/gckzfdb',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除工程款支付担保
+export function delGckzfdb(id) {
+ return request({
+ url: '/system/gckzfdb/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出工程款支付担保
+export function exportGckzfdb(query) {
+ return request({
+ url: '/system/gckzfdb/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/jwtech-admin-page/src/api/build/gzbzj.js b/jwtech-admin-page/src/api/build/gzbzj.js
new file mode 100644
index 00000000..95ca38e9
--- /dev/null
+++ b/jwtech-admin-page/src/api/build/gzbzj.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询工资保证金列表
+export function listGzbzj(query) {
+ return request({
+ url: '/system/gzbzj/list',
+ method: 'post',
+ data: query
+ })
+}
+
+// 查询工资保证金详细
+export function getGzbzj(id) {
+ return request({
+ url: '/system/gzbzj/' + id,
+ method: 'get'
+ })
+}
+
+// 新增工资保证金
+export function addGzbzj(data) {
+ return request({
+ url: '/system/gzbzj',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改工资保证金
+export function updateGzbzj(data) {
+ return request({
+ url: '/system/gzbzj',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除工资保证金
+export function delGzbzj(id) {
+ return request({
+ url: '/system/gzbzj/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出工资保证金
+export function exportGzbzj(query) {
+ return request({
+ url: '/system/gzbzj/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/index.vue
index 98f1e7ef..88dbfedf 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/index.vue
@@ -15,9 +15,23 @@
+
+
+
+
+
+
@@ -25,13 +39,17 @@
import realNameSystem from "./options/realNameSystem.vue";
import clockingIn from "./options/clockingIn.vue";
import marginAccount from "./options/marginAccount.vue";
+import specificMarginAccount from "./options/specificMarginAccount.vue";
import payroll from "./options/payroll.vue";
+import guaranteePaymentProjectFunds from "./options/guaranteePaymentProjectFunds.vue";
export default {
components: {
realNameSystem,
clockingIn,
marginAccount,
+ specificMarginAccount,
payroll,
+ guaranteePaymentProjectFunds,
},
props: ["proNo", "proCode"],
data() {
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
new file mode 100644
index 00000000..d495cd36
--- /dev/null
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
@@ -0,0 +1,628 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ parseTime(scope.row.guaranteeStartTime, "{y}-{m}-{d}")
+ }}
+
+
+
+
+ {{
+ parseTime(scope.row.guaranteeEndTime, "{y}-{m}-{d}")
+ }}
+
+
+
+
+
+ {{ parseTime(scope.row.provideTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
-
+ /> -->
+
+
+
+
+
+
+
+
@@ -520,10 +562,16 @@ export default {
peasantWorkers: [],
zhangHaoList: [],
selectOptionWidth: null,
+ // 支付方式字典
+ salaryPayableMethodsOptions: [],
+ fileList: [],
};
},
created() {
this.getList();
+ this.getDicts("wage_payment_method").then((response) => {
+ this.salaryPayableMethodsOptions = response.data;
+ });
listRealName({
data: {
proNo: this.proNo,
@@ -567,6 +615,12 @@ export default {
this.loading = false;
});
},
+ salaryPayableMethodsFormatter(row) {
+ return this.selectDictLabel(
+ this.salaryPayableMethodsOptions,
+ row.salaryPayableMethods
+ );
+ },
// 取消按钮
cancel() {
this.open = false;
@@ -574,6 +628,7 @@ export default {
},
// 表单重置
reset() {
+ this.fileList = [];
this.form = {
id: null,
bankAccount: null,
@@ -660,6 +715,9 @@ export default {
const id = row.id || this.ids;
getPayable(id).then((response) => {
this.form = response.data;
+ if (this.form.attachment) {
+ this.fileList = JSON.parse(this.form.attachment);
+ }
this.open = true;
this.title = "修改农民工工资发放管理";
});
@@ -668,8 +726,10 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
- this.form.proNo = this.proNo;
- this.form.proCode = this.proCode;
+ if (this.fileList.length) {
+ this.form.attachment = JSON.stringify(this.fileList);
+ }
+
if (this.form.id != null) {
updatePayable(this.form).then((response) => {
if (response.code === 200) {
@@ -679,6 +739,8 @@ export default {
}
});
} else {
+ this.form.proNo = this.proNo;
+ this.form.proCode = this.proCode;
addPayable(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
index 7a2201ce..9ecc9ceb 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
@@ -177,12 +177,33 @@
min-width="120"
/>
+
+
+
+ {{ item.name }}
+
+
+
+
+
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.accountsTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.transferTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 万元
+
+
+
+
+ 万元
+
+
+
+
+
+
+
+
+
+
+
+
+ 万元
+
+
+
+
+
+
+
+
+
+