diff --git a/src/components/form/CommonUpload.vue b/src/components/form/CommonUpload.vue
new file mode 100644
index 00000000..4fdbd0ab
--- /dev/null
+++ b/src/components/form/CommonUpload.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue
index 5ed1cbfb..f1c76d61 100644
--- a/src/components/form/FieldDatePicker.vue
+++ b/src/components/form/FieldDatePicker.vue
@@ -41,6 +41,8 @@
:type="type || 'date'"
:readonly="readonly"
:title="label || ''"
+ :min-date="minDate"
+ :max-date="maxDate"
@confirm="onConfirm"
@cancel="onCancel"
@change="onChanged"
@@ -62,6 +64,7 @@ export default {
'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换
'clearable', // 点击取消时清空绑定值
'yearRangeLength', // type === 'year' 时生成的年份数量范围 [YEAR - yearRangeLength, YEAR + yearRangeLength]
+ 'minDate', 'maxDate'
],
watch: {
value: function (newVal, oldVal) {
diff --git a/src/router/index.js b/src/router/index.js
index 3b52ab05..308f244c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3660,6 +3660,24 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_add'], resolve)
},
+ { ////阳光村务(新)-- 零工登记详情
+ path: '/sunVillage_info/list_tourists_registration_detail',
+ name: 'sunVillageInfoListTouristsRegistrationDetail',
+ meta: {
+ title: '查看零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_detail'], resolve)
+ },
+ { ////阳光村务(新)-- 零工登记修改
+ path: '/sunVillage_info/list_tourists_registration_edit',
+ name: 'sunVillageInfoListTouristsRegistrationEdit',
+ meta: {
+ title: '修改零工登记',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_edit'], resolve)
+ },
{ ////阳光村务(新)-- 合同信息
path: '/sunVillage_info/list_register',
name: 'sunVillageInfoListRegister',
diff --git a/src/utils/request.js b/src/utils/request.js
index 023805bc..278e298e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -69,7 +69,7 @@ if(responseInterceptor === undefined){
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
// console.info(gqnum); && gqnum === 0
- console.log(code)
+ // console.log(code)
if (code === 401) {
// gqnum++;
Dialog.confirm({
diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue
index b412e1b3..5e58fdb5 100644
--- a/src/views/sunVillage_info/list_tourists_registration.vue
+++ b/src/views/sunVillage_info/list_tourists_registration.vue
@@ -1,7 +1,7 @@
@@ -30,7 +30,7 @@
姓名
- {{item.workerName}}
+ {{item.workerName}}

@@ -43,7 +43,7 @@
出工事由
出工数
-
+
{{item.jobTime}}
{{item.workReason}}
{{item.workNum}}
@@ -54,12 +54,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -440,6 +534,7 @@
height: 100%;
position: absolute;
top: 0;
+ pointer-events: none;
}
.name_icon{
position: absolute;
@@ -501,4 +596,53 @@
.clear{
clear: both;
}
+.opera_btn{
+ width: 52px;
+ height: 52px;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content:center;
+
+ &.delete{
+ background:#df0707;
+ .icon{
+ width: 22px;
+ height: 29px;
+ background: url('../../assets/images/sunVillage_info/list_icon_7.png') no-repeat;
+ background-size: 100% 100%;
+ display: block;
+ }
+ }
+ &.edit{
+ background: #79cf13;
+ .icon {
+ width: 26px;
+ height: 25px;
+ background: url('../../assets/images/sunVillage_info/list_icon_6.png') no-repeat;
+ background-size: 100% 100%;
+ display: block;
+ }
+ }
+ &.view{
+ background: #3494ff;
+ .icon {
+ width: 29px;
+ height: 21px;
+ background: url('../../assets/images/sunVillage_info/list_icon_3.png') no-repeat;
+ background-size: 100% 100%;
+ display: block;
+ }
+ }
+ &.list{
+ background: #79cf13;
+ .icon {
+ width: 29px;
+ height: 21px;
+ background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+ background-size: 100% 100%;
+ display: block;
+ }
+ }
+}
diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue
index 75368e19..6c3c365f 100644
--- a/src/views/sunVillage_info/list_tourists_registration_add.vue
+++ b/src/views/sunVillage_info/list_tourists_registration_add.vue
@@ -2,7 +2,7 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,16 +70,38 @@
diff --git a/src/views/sunVillage_info/list_tourists_registration_detail.vue b/src/views/sunVillage_info/list_tourists_registration_detail.vue
new file mode 100644
index 00000000..c61d3c9c
--- /dev/null
+++ b/src/views/sunVillage_info/list_tourists_registration_detail.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue
new file mode 100644
index 00000000..7cb5d01a
--- /dev/null
+++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+

+
修改零工
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+