diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 2d7d15eb..c27f492e 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -262,3 +262,46 @@ export function majorEventOpenRemove(id) {
method: 'get'
})
}
+
+// 查询零工登记列表
+export function listOddjob(query) {
+ return request({
+ url: '/subcontract/oddjob/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 新增零工登记
+export function addOddjob(data) {
+ return request({
+ url: '/subcontract/oddjob/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改零工登记
+export function updateOddjob(data) {
+ return request({
+ url: '/subcontract/oddjob/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 查询零工登记详细
+export function getOddjob(id) {
+ return request({
+ url: '/subcontract/oddjob/get/' + id,
+ method: 'get'
+ })
+}
+
+// 删除零工登记
+export function delOddjob(id) {
+ return request({
+ url: '/subcontract/oddjob/remove/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/assets/images/sunVillage_info/index_block_6.png b/src/assets/images/sunVillage_info/index_block_6.png
new file mode 100644
index 00000000..ef105bf2
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_6.png differ
diff --git a/src/router/index.js b/src/router/index.js
index 64f37da8..c07532a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3088,6 +3088,42 @@ export const constantRoutes = [
hidden: true,
},
component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/list_register',
+ name: 'sunVillageInfoListRegister',
+ meta: {
+ title: '零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_register'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/list_register_add',
+ name: 'sunVillageInfoListRegisterAdd',
+ meta: {
+ title: '新增零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_register_add'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/list_register_edit',
+ name: 'sunVillageInfoListRegisterEdit',
+ meta: {
+ title: '新增零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_register_edit'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/list_register_detail',
+ name: 'sunVillageInfoListRegisterDetail',
+ meta: {
+ title: '查看零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve)
}
];
diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index f99b464c..8c24f8aa 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -37,6 +37,7 @@
财务公开榜
零工公开榜
+
零工登记
重大事项
固定资产
合同登记
@@ -246,7 +247,7 @@
align-items: center;
justify-content: center;
padding-top: 120px;
- &:nth-child(3){
+ &:nth-child(3n){
margin-right: 0;
}
&.n_1{
@@ -269,6 +270,10 @@
background: url('../../assets/images/sunVillage_info/index_block_5.png') no-repeat;
background-size: 100% 100%;
}
+ &.n_6 {
+ background: url('../../assets/images/sunVillage_info/index_block_6.png') no-repeat;
+ background-size: 100% 100%;
+ }
}
}
}
diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue
index 6462ec4d..52ef4eae 100644
--- a/src/views/sunVillage_info/list_finance.vue
+++ b/src/views/sunVillage_info/list_finance.vue
@@ -180,6 +180,7 @@
this.$dialog.alert({
title: '提示',
message: '确认删除?',
+ showCancelButton:true,
})
.then(() => {
openRemove(id).then(response => {
diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue
index 77a43ed3..db9a1f3e 100644
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -302,5 +302,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}
diff --git a/src/views/sunVillage_info/list_finance_edit.vue b/src/views/sunVillage_info/list_finance_edit.vue
index 5ad36c55..c0df8ebe 100644
--- a/src/views/sunVillage_info/list_finance_edit.vue
+++ b/src/views/sunVillage_info/list_finance_edit.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -332,5 +332,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}
diff --git a/src/views/sunVillage_info/list_issues.vue b/src/views/sunVillage_info/list_issues.vue
index d528d626..00c4c907 100644
--- a/src/views/sunVillage_info/list_issues.vue
+++ b/src/views/sunVillage_info/list_issues.vue
@@ -173,6 +173,7 @@
this.$dialog.alert({
title: '提示',
message: '确认删除?',
+ showCancelButton:true,
})
.then(() => {
majorEventOpenRemove(id).then(response => {
diff --git a/src/views/sunVillage_info/list_issues_add.vue b/src/views/sunVillage_info/list_issues_add.vue
index e7d0fa28..eb5a781d 100644
--- a/src/views/sunVillage_info/list_issues_add.vue
+++ b/src/views/sunVillage_info/list_issues_add.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -309,5 +309,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}
diff --git a/src/views/sunVillage_info/list_issues_edit.vue b/src/views/sunVillage_info/list_issues_edit.vue
index 3274dacc..2b304bf1 100644
--- a/src/views/sunVillage_info/list_issues_edit.vue
+++ b/src/views/sunVillage_info/list_issues_edit.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -338,5 +338,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}
diff --git a/src/views/sunVillage_info/list_register.vue b/src/views/sunVillage_info/list_register.vue
new file mode 100644
index 00000000..bcc71397
--- /dev/null
+++ b/src/views/sunVillage_info/list_register.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item.workerName}}
+
+
¥{{item.totalMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_register_add.vue b/src/views/sunVillage_info/list_register_add.vue
new file mode 100644
index 00000000..a42ab13d
--- /dev/null
+++ b/src/views/sunVillage_info/list_register_add.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_register_detail.vue b/src/views/sunVillage_info/list_register_detail.vue
new file mode 100644
index 00000000..b8929be7
--- /dev/null
+++ b/src/views/sunVillage_info/list_register_detail.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_register_edit.vue b/src/views/sunVillage_info/list_register_edit.vue
new file mode 100644
index 00000000..7172904b
--- /dev/null
+++ b/src/views/sunVillage_info/list_register_edit.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue
index 6e12b407..b11dd5cd 100644
--- a/src/views/sunVillage_info/list_tourists.vue
+++ b/src/views/sunVillage_info/list_tourists.vue
@@ -179,6 +179,7 @@
this.$dialog.alert({
title: '提示',
message: '确认删除?',
+ showCancelButton:true,
})
.then(() => {
tempWorkerOpenRemove(id).then(response => {
diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 872d8976..f0b940f3 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -302,5 +302,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index 66b66457..29350006 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -43,7 +43,7 @@
-
+
公开图片
@@ -332,5 +332,8 @@
/deep/ .van-cell--required::before{
left: 85PX;
}
+ /deep/ .van-field__error-message{
+ display: none;
+ }
}