From d96ed41928602059862eb50fcc39937ad238f4f1 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Fri, 20 Sep 2024 16:45:21 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1-?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=B8=AD=E3=80=81=E4=BA=8B=E5=90=8E?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_tourists.vue   |  1 +
 .../sunVillage_info/list_tourists_add.vue     | 82 ++++++++++++++++-
 .../sunVillage_info/list_tourists_detail.vue  | 33 ++++++-
 .../sunVillage_info/list_tourists_edit.vue    | 92 ++++++++++++++++++-
 4 files changed, 202 insertions(+), 6 deletions(-)

diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue
index a49e15f7..b59066fd 100644
--- a/src/views/sunVillage_info/list_tourists.vue
+++ b/src/views/sunVillage_info/list_tourists.vue
@@ -190,6 +190,7 @@
           .then(() => {
             tempWorkerOpenRemove(id).then(response => {
               this.$notify({ type: 'success', message: '删除成功' });
+              this.applicationList = [];
               this.getList()
             });
           })
diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 943f8338..4770b794 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -46,11 +46,27 @@
         <van-field readonly input-align="right" :border="false" >
           <template #label>
             <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-            <p style="margin-left: 5px;">公开图片</p>
+            <p style="margin-left: 5px;">事前公开</p>
           </template>
         </van-field>
         <!--           @delete="deleteFile1"-->
         <van-uploader v-model="fileList" multiple :after-read="afterRead" @delete="deleteFile1"  style="margin-top: 10PX" />
+        <van-field readonly input-align="right" :border="false" >
+          <template #label>
+            <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+            <p style="margin-left: 5px;">事中公开</p>
+          </template>
+        </van-field>
+        <!--           @delete="deleteFile1"-->
+        <van-uploader v-model="fileList2" multiple :after-read="afterRead2" @delete="deleteFile2"  style="margin-top: 10PX" />
+        <van-field readonly input-align="right" :border="false" >
+          <template #label>
+            <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+            <p style="margin-left: 5px;">事后公开</p>
+          </template>
+        </van-field>
+        <!--           @delete="deleteFile1"-->
+        <van-uploader v-model="fileList3" multiple :after-read="afterRead3" @delete="deleteFile3"  style="margin-top: 10PX" />
 
         <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
           <van-field readonly input-align="right" :border="false" >
@@ -102,12 +118,16 @@
         form:{
           openNy:this.format(new Date(),'yyyy-MM'),
           openPic:'',
+          openPic2:'',
+          openPic3:'',
           openFile:'',
           openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开'
         },
         openPic:[],
         fileList:[],
         fileList1:[],
+        fileList2:[],
+        fileList3:[],
         openNy:new Date(),
         type:'',
         openFile:[],
@@ -118,6 +138,8 @@
         },
         openFile2:[],
         openPic2:[],
+        openPic3:[],
+        openPic4:[],
       };
     },
     created() {
@@ -139,6 +161,8 @@
         var that = this;
         that.form.openFile = that.openFile2.join(',')
         that.form.openPic = that.openPic2.join(',')
+        that.form.openPic2 = that.openPic3.join(',')
+        that.form.openPic3 = that.openPic4.join(',')
         tempWorkerOpenAdd(that.form).then((r1) => {
           if (r1.code == 200){
             that.$notify({ type: 'success', message: '新增成功' });
@@ -157,6 +181,14 @@
         this.openPic2.splice(detail.index,1)
         // this.form.openPic.splice(index,1);
       },
+      deleteFile2(detail){
+        this.openPic3.splice(detail.index,1)
+        // this.form.openPic.splice(index,1);
+      },
+      deleteFile3(detail){
+        this.openPic4.splice(detail.index,1)
+        // this.form.openPic.splice(index,1);
+      },
       deleteWord(index){
         this.openFileList.splice(index,1);
         this.openFile2.splice(index,1);
@@ -170,7 +202,6 @@
         // 此时可以自行将文件上传至服务器
         if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
           file.map(res=>{
-            this.openPic.push(res.file);
             let params1 = new FormData();
             params1.append("file", res.file);
             commonUpload(params1).then((r1) => {
@@ -178,7 +209,6 @@
             })
           })
         }else{
-          this.openPic.push(file);
           let params1 = new FormData();
           params1.append("file", file.file);
           commonUpload(params1).then((r1) => {
@@ -186,6 +216,52 @@
           })
         }
       },
+      afterRead2(file) {
+        this.$toast.loading({
+          message: "上传中...",
+          forbidClick: true,
+          duration: 0,
+        });
+        // 此时可以自行将文件上传至服务器
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic3.push(r1.fileName);
+            })
+          })
+        }else{
+          let params1 = new FormData();
+          params1.append("file", file.file);
+          commonUpload(params1).then((r1) => {
+            this.openPic3.push(r1.fileName);
+          })
+        }
+      },
+      afterRead3(file) {
+        this.$toast.loading({
+          message: "上传中...",
+          forbidClick: true,
+          duration: 0,
+        });
+        // 此时可以自行将文件上传至服务器
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic4.push(r1.fileName);
+            })
+          })
+        }else{
+          let params1 = new FormData();
+          params1.append("file", file.file);
+          commonUpload(params1).then((r1) => {
+            this.openPic4.push(r1.fileName);
+          })
+        }
+      },
       afterReadOpenFile(file){
         this.$toast.loading({
           message: "上传中...",
diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue
index ed98aa51..2d85901f 100644
--- a/src/views/sunVillage_info/list_tourists_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_detail.vue
@@ -36,12 +36,28 @@
            <van-field readonly input-align="right" :border="false" >
              <template #label>
                <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">公开图片</p>
+               <p style="margin-left: 5px;">事前公开</p>
              </template>
            </van-field>
 <!--           @delete="deleteFile1"-->
            <van-uploader v-model="openPic" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
+           <van-field readonly input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+               <p style="margin-left: 5px;">事中公开</p>
+             </template>
+           </van-field>
+           <!--           @delete="deleteFile1"-->
+           <van-uploader v-model="openPic2" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
 
+           <van-field readonly input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+               <p style="margin-left: 5px;">事后公开</p>
+             </template>
+           </van-field>
+           <!--           @delete="deleteFile1"-->
+           <van-uploader v-model="openPic3" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly input-align="right" :border="false" >
                <template #label>
@@ -92,6 +108,8 @@
         fjImg:'',
         fjImgShow:false,
         openPic:[],
+        openPic2:[],
+        openPic3:[],
         fileList:[],
         fileList1:[],
         openNy:new Date(),
@@ -144,7 +162,18 @@
               this.openPic.push({url:'/api'+rrr})
             })
           }
-
+          if (res.data.openPic2 !='' && res.data.openPic2 != null && res.data.openPic2 != undefined){
+            res.data.openPic2 = res.data.openPic2.split(',')
+            res.data.openPic2.map((rrr,i)=>{
+              this.openPic2.push({url:'/api'+rrr})
+            })
+          }
+          if (res.data.openPic3 !='' && res.data.openPic3 != null && res.data.openPic3 != undefined){
+            res.data.openPic3 = res.data.openPic3.split(',')
+            res.data.openPic3.map((rrr,i)=>{
+              this.openPic3.push({url:'/api'+rrr})
+            })
+          }
           this.form = res.data;
         })
       },
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index 6344b23c..476b98ba 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -46,12 +46,30 @@
            <van-field readonly input-align="right" :border="false" >
              <template #label>
                <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">公开图片</p>
+               <p style="margin-left: 5px;">事前公开</p>
              </template>
            </van-field>
 <!--           @delete="deleteFile1"-->
            <van-uploader v-model="openPic" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX" />
 
+           <van-field readonly input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+               <p style="margin-left: 5px;">事中公开</p>
+             </template>
+           </van-field>
+           <!--           @delete="deleteFile1"-->
+           <van-uploader v-model="openPicsz" multiple :after-read="afterRead2" @delete="deleteFile2" style="margin-top: 10PX" />
+
+           <van-field readonly input-align="right" :border="false" >
+             <template #label>
+               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
+               <p style="margin-left: 5px;">事后公开</p>
+             </template>
+           </van-field>
+           <!--           @delete="deleteFile1"-->
+           <van-uploader v-model="openPicsh" multiple :after-read="afterRead3" @delete="deleteFile3" style="margin-top: 10PX" />
+
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly input-align="right" :border="false" >
                <template #label>
@@ -105,6 +123,8 @@
           openFile:'',
         },
         openPic:[],
+        openPicsz:[],
+        openPicsh:[],
         fileList:[],
         fileList1:[],
         openNy:new Date(),
@@ -117,6 +137,8 @@
           deptId:''
         },
         openPic2:[],
+        openPic3:[],
+        openPic4:[],
         openFile2:[]
       };
     },
@@ -161,6 +183,20 @@
               this.openPic[i] = {url:'/api'+rrr}
             })
           }
+          if (res.data.openPic2!='' && res.data.openPic2 != null && res.data.openPic2 != undefined){
+            this.openPicsz = res.data.openPic2.split(',')
+            this.openPic3 = res.data.openPic2.split(',')
+            this.openPicsz.map((rrr,i)=>{
+              this.openPicsz[i] = {url:'/api'+rrr}
+            })
+          }
+          if (res.data.openPic3!='' && res.data.openPic3 != null && res.data.openPic3 != undefined){
+            this.openPicsh = res.data.openPic3.split(',')
+            this.openPic4 = res.data.openPic3.split(',')
+            this.openPicsh.map((rrr,i)=>{
+              this.openPicsh[i] = {url:'/api'+rrr}
+            })
+          }
           that.form = res.data;
         })
       },
@@ -168,6 +204,8 @@
         var that = this;
         that.form.openFile = that.openFile2.join(',')
         that.form.openPic = that.openPic2.join(',')
+        that.form.openPic2 = that.openPic3.join(',')
+        that.form.openPic3 = that.openPic4.join(',')
         tempWorkerOpenEdit(that.form).then((r1) => {
           if (r1.code == 200){
             that.$notify({ type: 'success', message: '修改成功' });
@@ -186,6 +224,12 @@
         console.log(detail)
         this.openPic2.splice(detail.index,1)
       },
+      deleteFile2(file,detail){
+        this.openPic3.splice(detail.index,1)
+      },
+      deleteFile3(file,detail){
+        this.openPic4.splice(detail.index,1)
+      },
       deleteWord(index){
         this.openFile.splice(index,1);
         this.openFile2.splice(index,1);
@@ -213,6 +257,52 @@
           })
         }
       },
+      afterRead2(file) {
+        this.$toast.loading({
+          message: "上传中...",
+          forbidClick: true,
+          duration: 0,
+        });
+        // 此时可以自行将文件上传至服务器
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic3.push(r1.fileName);
+            })
+          })
+        }else{
+          let params1 = new FormData();
+          params1.append("file", file.file);
+          commonUpload(params1).then((r1) => {
+            this.openPic3.push(r1.fileName);
+          })
+        }
+      },
+      afterRead3(file) {
+        this.$toast.loading({
+          message: "上传中...",
+          forbidClick: true,
+          duration: 0,
+        });
+        // 此时可以自行将文件上传至服务器
+        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+          file.map(res=>{
+            let params1 = new FormData();
+            params1.append("file", res.file);
+            commonUpload(params1).then((r1) => {
+              this.openPic4.push(r1.fileName);
+            })
+          })
+        }else{
+          let params1 = new FormData();
+          params1.append("file", file.file);
+          commonUpload(params1).then((r1) => {
+            this.openPic4.push(r1.fileName);
+          })
+        }
+      },
       afterReadOpenFile(file){
         this.$toast.loading({
           message: "上传中...",

From 5917cdf724fffa8d247b969f5a9910ca30b7ae43 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Sat, 12 Oct 2024 14:06:30 +0800
Subject: [PATCH 02/10] =?UTF-8?q?Task=20=E9=9B=B6=E5=B7=A5=E5=85=AC?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunVillage_info/list_tourists_add.vue     | 81 +---------------
 .../sunVillage_info/list_tourists_detail.vue  | 32 +------
 .../sunVillage_info/list_tourists_edit.vue    | 94 +------------------
 .../sunVillage_info/list_tourists_ranking.vue |  2 +-
 4 files changed, 5 insertions(+), 204 deletions(-)

diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue
index 4770b794..17e5ac2e 100644
--- a/src/views/sunVillage_info/list_tourists_add.vue
+++ b/src/views/sunVillage_info/list_tourists_add.vue
@@ -46,27 +46,11 @@
         <van-field readonly input-align="right" :border="false" >
           <template #label>
             <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-            <p style="margin-left: 5px;">事前公开</p>
+            <p style="margin-left: 5px;">公开图片</p>
           </template>
         </van-field>
         <!--           @delete="deleteFile1"-->
         <van-uploader v-model="fileList" multiple :after-read="afterRead" @delete="deleteFile1"  style="margin-top: 10PX" />
-        <van-field readonly input-align="right" :border="false" >
-          <template #label>
-            <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-            <p style="margin-left: 5px;">事中公开</p>
-          </template>
-        </van-field>
-        <!--           @delete="deleteFile1"-->
-        <van-uploader v-model="fileList2" multiple :after-read="afterRead2" @delete="deleteFile2"  style="margin-top: 10PX" />
-        <van-field readonly input-align="right" :border="false" >
-          <template #label>
-            <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-            <p style="margin-left: 5px;">事后公开</p>
-          </template>
-        </van-field>
-        <!--           @delete="deleteFile1"-->
-        <van-uploader v-model="fileList3" multiple :after-read="afterRead3" @delete="deleteFile3"  style="margin-top: 10PX" />
 
         <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
           <van-field readonly input-align="right" :border="false" >
@@ -118,16 +102,11 @@
         form:{
           openNy:this.format(new Date(),'yyyy-MM'),
           openPic:'',
-          openPic2:'',
-          openPic3:'',
           openFile:'',
           openName:this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月零工公开'
         },
         openPic:[],
         fileList:[],
-        fileList1:[],
-        fileList2:[],
-        fileList3:[],
         openNy:new Date(),
         type:'',
         openFile:[],
@@ -138,8 +117,6 @@
         },
         openFile2:[],
         openPic2:[],
-        openPic3:[],
-        openPic4:[],
       };
     },
     created() {
@@ -161,8 +138,6 @@
         var that = this;
         that.form.openFile = that.openFile2.join(',')
         that.form.openPic = that.openPic2.join(',')
-        that.form.openPic2 = that.openPic3.join(',')
-        that.form.openPic3 = that.openPic4.join(',')
         tempWorkerOpenAdd(that.form).then((r1) => {
           if (r1.code == 200){
             that.$notify({ type: 'success', message: '新增成功' });
@@ -181,14 +156,6 @@
         this.openPic2.splice(detail.index,1)
         // this.form.openPic.splice(index,1);
       },
-      deleteFile2(detail){
-        this.openPic3.splice(detail.index,1)
-        // this.form.openPic.splice(index,1);
-      },
-      deleteFile3(detail){
-        this.openPic4.splice(detail.index,1)
-        // this.form.openPic.splice(index,1);
-      },
       deleteWord(index){
         this.openFileList.splice(index,1);
         this.openFile2.splice(index,1);
@@ -216,52 +183,6 @@
           })
         }
       },
-      afterRead2(file) {
-        this.$toast.loading({
-          message: "上传中...",
-          forbidClick: true,
-          duration: 0,
-        });
-        // 此时可以自行将文件上传至服务器
-        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
-          file.map(res=>{
-            let params1 = new FormData();
-            params1.append("file", res.file);
-            commonUpload(params1).then((r1) => {
-              this.openPic3.push(r1.fileName);
-            })
-          })
-        }else{
-          let params1 = new FormData();
-          params1.append("file", file.file);
-          commonUpload(params1).then((r1) => {
-            this.openPic3.push(r1.fileName);
-          })
-        }
-      },
-      afterRead3(file) {
-        this.$toast.loading({
-          message: "上传中...",
-          forbidClick: true,
-          duration: 0,
-        });
-        // 此时可以自行将文件上传至服务器
-        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
-          file.map(res=>{
-            let params1 = new FormData();
-            params1.append("file", res.file);
-            commonUpload(params1).then((r1) => {
-              this.openPic4.push(r1.fileName);
-            })
-          })
-        }else{
-          let params1 = new FormData();
-          params1.append("file", file.file);
-          commonUpload(params1).then((r1) => {
-            this.openPic4.push(r1.fileName);
-          })
-        }
-      },
       afterReadOpenFile(file){
         this.$toast.loading({
           message: "上传中...",
diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue
index 2d85901f..a8607721 100644
--- a/src/views/sunVillage_info/list_tourists_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_detail.vue
@@ -36,28 +36,12 @@
            <van-field readonly input-align="right" :border="false" >
              <template #label>
                <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事前公开</p>
+               <p style="margin-left: 5px;">公开图片</p>
              </template>
            </van-field>
 <!--           @delete="deleteFile1"-->
            <van-uploader v-model="openPic" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
-           <van-field readonly input-align="right" :border="false" >
-             <template #label>
-               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事中公开</p>
-             </template>
-           </van-field>
-           <!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPic2" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
 
-           <van-field readonly input-align="right" :border="false" >
-             <template #label>
-               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事后公开</p>
-             </template>
-           </van-field>
-           <!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPic3" :show-upload="false" :deletable="false" multiple style="margin-top: 10PX" />
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly input-align="right" :border="false" >
                <template #label>
@@ -108,8 +92,6 @@
         fjImg:'',
         fjImgShow:false,
         openPic:[],
-        openPic2:[],
-        openPic3:[],
         fileList:[],
         fileList1:[],
         openNy:new Date(),
@@ -162,18 +144,6 @@
               this.openPic.push({url:'/api'+rrr})
             })
           }
-          if (res.data.openPic2 !='' && res.data.openPic2 != null && res.data.openPic2 != undefined){
-            res.data.openPic2 = res.data.openPic2.split(',')
-            res.data.openPic2.map((rrr,i)=>{
-              this.openPic2.push({url:'/api'+rrr})
-            })
-          }
-          if (res.data.openPic3 !='' && res.data.openPic3 != null && res.data.openPic3 != undefined){
-            res.data.openPic3 = res.data.openPic3.split(',')
-            res.data.openPic3.map((rrr,i)=>{
-              this.openPic3.push({url:'/api'+rrr})
-            })
-          }
           this.form = res.data;
         })
       },
diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue
index 476b98ba..ed93f4ee 100644
--- a/src/views/sunVillage_info/list_tourists_edit.vue
+++ b/src/views/sunVillage_info/list_tourists_edit.vue
@@ -46,30 +46,12 @@
            <van-field readonly input-align="right" :border="false" >
              <template #label>
                <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事前公开</p>
+               <p style="margin-left: 5px;">公开图片</p>
              </template>
            </van-field>
 <!--           @delete="deleteFile1"-->
            <van-uploader v-model="openPic" multiple :after-read="afterRead" @delete="deleteFile1" style="margin-top: 10PX" />
 
-           <van-field readonly input-align="right" :border="false" >
-             <template #label>
-               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事中公开</p>
-             </template>
-           </van-field>
-           <!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPicsz" multiple :after-read="afterRead2" @delete="deleteFile2" style="margin-top: 10PX" />
-
-           <van-field readonly input-align="right" :border="false" >
-             <template #label>
-               <img src="../../assets/images/sunVillage_info/add_tit_icon_03.png" width="18">
-               <p style="margin-left: 5px;">事后公开</p>
-             </template>
-           </van-field>
-           <!--           @delete="deleteFile1"-->
-           <van-uploader v-model="openPicsh" multiple :after-read="afterRead3" @delete="deleteFile3" style="margin-top: 10PX" />
-
            <div style="border-top: 1px solid #ededed;margin-top: 10PX;">
              <van-field readonly input-align="right" :border="false" >
                <template #label>
@@ -123,8 +105,6 @@
           openFile:'',
         },
         openPic:[],
-        openPicsz:[],
-        openPicsh:[],
         fileList:[],
         fileList1:[],
         openNy:new Date(),
@@ -137,8 +117,6 @@
           deptId:''
         },
         openPic2:[],
-        openPic3:[],
-        openPic4:[],
         openFile2:[]
       };
     },
@@ -183,20 +161,6 @@
               this.openPic[i] = {url:'/api'+rrr}
             })
           }
-          if (res.data.openPic2!='' && res.data.openPic2 != null && res.data.openPic2 != undefined){
-            this.openPicsz = res.data.openPic2.split(',')
-            this.openPic3 = res.data.openPic2.split(',')
-            this.openPicsz.map((rrr,i)=>{
-              this.openPicsz[i] = {url:'/api'+rrr}
-            })
-          }
-          if (res.data.openPic3!='' && res.data.openPic3 != null && res.data.openPic3 != undefined){
-            this.openPicsh = res.data.openPic3.split(',')
-            this.openPic4 = res.data.openPic3.split(',')
-            this.openPicsh.map((rrr,i)=>{
-              this.openPicsh[i] = {url:'/api'+rrr}
-            })
-          }
           that.form = res.data;
         })
       },
@@ -204,8 +168,6 @@
         var that = this;
         that.form.openFile = that.openFile2.join(',')
         that.form.openPic = that.openPic2.join(',')
-        that.form.openPic2 = that.openPic3.join(',')
-        that.form.openPic3 = that.openPic4.join(',')
         tempWorkerOpenEdit(that.form).then((r1) => {
           if (r1.code == 200){
             that.$notify({ type: 'success', message: '修改成功' });
@@ -221,15 +183,9 @@
         this.showBuildTime = false;
       },
       deleteFile1(file,detail){
-        console.log(detail)
+        //console.log(detail)
         this.openPic2.splice(detail.index,1)
       },
-      deleteFile2(file,detail){
-        this.openPic3.splice(detail.index,1)
-      },
-      deleteFile3(file,detail){
-        this.openPic4.splice(detail.index,1)
-      },
       deleteWord(index){
         this.openFile.splice(index,1);
         this.openFile2.splice(index,1);
@@ -257,52 +213,6 @@
           })
         }
       },
-      afterRead2(file) {
-        this.$toast.loading({
-          message: "上传中...",
-          forbidClick: true,
-          duration: 0,
-        });
-        // 此时可以自行将文件上传至服务器
-        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
-          file.map(res=>{
-            let params1 = new FormData();
-            params1.append("file", res.file);
-            commonUpload(params1).then((r1) => {
-              this.openPic3.push(r1.fileName);
-            })
-          })
-        }else{
-          let params1 = new FormData();
-          params1.append("file", file.file);
-          commonUpload(params1).then((r1) => {
-            this.openPic3.push(r1.fileName);
-          })
-        }
-      },
-      afterRead3(file) {
-        this.$toast.loading({
-          message: "上传中...",
-          forbidClick: true,
-          duration: 0,
-        });
-        // 此时可以自行将文件上传至服务器
-        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
-          file.map(res=>{
-            let params1 = new FormData();
-            params1.append("file", res.file);
-            commonUpload(params1).then((r1) => {
-              this.openPic4.push(r1.fileName);
-            })
-          })
-        }else{
-          let params1 = new FormData();
-          params1.append("file", file.file);
-          commonUpload(params1).then((r1) => {
-            this.openPic4.push(r1.fileName);
-          })
-        }
-      },
       afterReadOpenFile(file){
         this.$toast.loading({
           message: "上传中...",
diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue
index 64d38268..eb04a406 100644
--- a/src/views/sunVillage_info/list_tourists_ranking.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking.vue
@@ -80,7 +80,7 @@
         queryParams:{
           pageNum:1,
           pageSize:10,
-          orderByColumn:'openNy',
+          orderByColumn:'jobNy',
           isAsc:'desc',
           year:'',
         },

From 024f389d5288df8e58f18aef64f79c9dddd5a9f8 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Sat, 12 Oct 2024 16:04:14 +0800
Subject: [PATCH 03/10] =?UTF-8?q?Task=20=E9=9B=B6=E5=B7=A5=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/CommonUpload.vue          | 160 ++++++++++++
 src/components/form/FieldDatePicker.vue       |   3 +
 src/router/index.js                           |  18 ++
 src/utils/request.js                          |   2 +-
 .../list_tourists_registration.vue            | 152 +++++++++++-
 .../list_tourists_registration_add.vue        | 141 ++++++-----
 .../list_tourists_registration_detail.vue     | 188 ++++++++++++++
 .../list_tourists_registration_edit.vue       | 230 ++++++++++++++++++
 8 files changed, 828 insertions(+), 66 deletions(-)
 create mode 100644 src/components/form/CommonUpload.vue
 create mode 100644 src/views/sunVillage_info/list_tourists_registration_detail.vue
 create mode 100644 src/views/sunVillage_info/list_tourists_registration_edit.vue

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 @@
+<!-- 通用上传组件 zhao -->
+
+<template>
+  <van-uploader
+          v-model="fileList"
+          :multiple="multiple"
+          :after-read="afterRead"
+          :show-upload="showUpload"
+          :deletable="deletable"
+          @delete="deleteFile"
+          :accept="accept || null"
+  />
+</template>
+
+<script>
+
+import {commonUpload} from "@/api/sunVillage_info/fixedAssets";
+
+export default {
+  name: "commonUpload",
+  props: {
+    name: String,
+    value: { // 绑定值 字符串 ,分隔 可监听
+      type: String,
+      default: null,
+    },
+    accept: { // 上传类型限制: 默认图片, * = 任意类型
+      type: String,
+    },
+    multiple: { // 多文件上传
+      type: Boolean,
+      default: false,
+    },
+    deletable: { // 允许删除
+      type: Boolean,
+      default: true,
+    },
+    showUpload: { // 显示上传按钮
+      type: Boolean,
+      default: true,
+    },
+    formData: { // 额外请求参数
+      type: Object,
+      default: function() {
+        return {};
+      },
+    },
+    file: { // 上传文件字段名
+      type: String,
+      default: 'file',
+    },
+    host: {
+      type: String, // 文件地址前缀
+      default: '/api',
+    },
+  },
+  watch: {
+    value: function (newVal, oldVal) {
+      if(newVal != this.internalValue)
+        this.setInternalValue(newVal);
+    },
+  },
+  created() {
+    this.parseValue(this.value);
+  },
+  data() {
+    return {
+      internalValue: this.value,
+      fileList: [],
+      pathList: [],
+    };
+  },
+  methods: {
+    setInternalValue(newVal) {
+      this.parseValue(newVal);
+      this.internalValue = newVal;
+    },
+    parseValue(data) {
+      if(data)
+      {
+        this.pathList = data.split(',');
+      }
+      else
+      {
+        this.pathList = [];
+      }
+      this.fileList = this.pathList.map((x) => {
+        return {
+          url: this.host + x,
+        };
+      });
+    },
+    makeFormData() {
+      let fd = new FormData();
+      if(this.formData)
+      {
+        for(let k of Object.keys(this.formData))
+        {
+          fd.set(k, this.formData[k]);
+        }
+      }
+      return fd;
+    },
+    upload(file) {
+      let params1 = this.makeFormData();
+      params1.append(this.file, file.file);
+      return commonUpload(params1).then((resp) => {
+        this.pathList.push(resp.fileName);
+        this.updateInternalValue();
+        this.$emit('upload', resp.fileName);
+      });
+    },
+    afterRead(file) {
+      this.$toast.loading({
+        message: "上传中...",
+        forbidClick: true,
+        duration: 0,
+      });
+      // 此时可以自行将文件上传至服务器
+      if (file instanceof Array) {//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
+        if(file.length > 0)
+        {
+          let index = 0;
+          const f = () => {
+            if(index >= file.length)
+              return;
+            let up = file[index];
+            //console.log(up);
+            console.log(`上传文件: ${index} -> ${up.file.name}`);
+            this.upload(up).then(() => {
+              index++;
+              if(index < file.length)
+                f();
+            });
+          };
+          f();
+        }
+      } else {
+        this.upload(file);
+      }
+    },
+    deleteFile(detail){
+      this.pathList.splice(detail.index,1);
+      this.updateInternalValue();
+      this.$emit('remove', detail.index);
+    },
+    updateInternalValue() {
+      let files = this.pathList.join(',');
+      console.log(files);
+      this.internalValue = files;
+      if(this.internalValue != this.value)
+        this.$emit('input', this.internalValue);
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
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 @@
 <template>
     <div class="home_wrapper">
         <div class="header_main">
-            零工登记
+            新增零工登记
             <div class="return_btn" @click="onClickLeft"></div>
             <div class="add_btn" v-show="showBtn" @click="$router.push({path:'/sunVillage_info/list_tourists_registration_add'})"></div>
         </div>
@@ -30,7 +30,7 @@
             <van-col :span="24">姓名</van-col>
           </van-row>
           <van-row v-for="(item,index) in oddjobList" :key="index">
-            <van-col :span="24">{{item.workerName}}</van-col>
+            <van-col :span="24" @click="onItemClicked(item, index)">{{item.workerName}}</van-col>
           </van-row>
           <div class="name_bg"></div>
           <img src="../../assets/images/sunVillage_info/name_icon.png" class="name_icon"/>
@@ -43,7 +43,7 @@
               <van-col :span="8">出工事由</van-col>
               <van-col :span="8">出工数</van-col>
             </van-row>
-            <van-row v-for="(item,index) in oddjobList" :key="index">
+            <van-row v-for="(item,index) in oddjobList" :key="index" @click="onItemClicked(item, index)">
               <van-col :span="8">{{item.jobTime}}</van-col>
               <van-col :span="8">{{item.workReason}}</van-col>
               <van-col :span="8">{{item.workNum}}</van-col>
@@ -54,12 +54,43 @@
         <div class="clear"></div>
       </div>
 
+      <van-popup
+          v-model="menuOpen"
+          :closeable="false"
+          close-icon="close"
+          position="bottom"
+          @close="onMenuClose"
+      >
+        <van-grid :column-num="3">
+          <van-grid-item text="查看" @click="viewItem(menuId)">
+            <template #icon>
+              <div class="opera_btn view">
+                <i class="icon "></i>
+              </div>
+            </template>
+          </van-grid-item>
+          <van-grid-item text="修改" @click="editItem(menuId)">
+            <template #icon>
+              <div class="opera_btn edit">
+                <i class="icon "></i>
+              </div>
+            </template>
+          </van-grid-item>
+          <van-grid-item text="删除" @click="removeItem(menuId)">
+            <template #icon>
+              <div class="opera_btn delete">
+                <i class="icon "></i>
+              </div>
+            </template>
+          </van-grid-item>
+        </van-grid>
+      </van-popup>
 
     </div>
 </template>
 
 <script>
-  import { listOddjob } from "@/api/sunVillage_info/fixedAssets";
+import {delOddjob, listOddjob, tempWorkerOpenRemove} from "@/api/sunVillage_info/fixedAssets";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
@@ -96,6 +127,8 @@
         oddjobList:[],
         deptName:'',
         nowYear:new Date().getFullYear(),
+        menuOpen: false,
+        menuId: null,
       };
     },
     created() {
@@ -149,7 +182,68 @@
         this.applicationList = [];
         this.getList();
       },
+      onItemClicked(item, index) {
+        console.log(`点击(${item.id})`);
+        this.menuId = item.id;
+        this.menuOpen = true;
+      },
+      onMenuClose() {
+        this.menuId = null;
+      },
+      viewItem(id){
+        console.log(`查看(${id})`);
+        this.menuOpen = false;
+        if(!id)
+          return;
 
+        this.$router.push({
+          path: "/sunVillage_info/list_tourists_registration_detail",
+          query: {
+            id: id,
+            intent: 'view',
+          },
+        }).catch(() => {});
+      },
+      editItem(id){
+        console.log(`编辑(${id})`);
+        this.menuOpen = false;
+        if(!id)
+          return;
+
+        this.$router.push({
+          path: "/sunVillage_info/list_tourists_registration_edit",
+          query: {
+            id: id,
+            intent: 'edit',
+          },
+        }).catch(() => {});
+      },
+      removeItem(id){
+        console.log(`移除(${id})`);
+        this.menuOpen = false;
+        if(!id)
+          return;
+
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认删除？',
+          showCancelButton:true,
+        }).then(() => {
+          delOddjob(id).then(response => {
+            this.$notify({ type: 'success', message: '删除成功' });
+            /*this.$toast({
+              icon: 'success',
+              message: '删除成功',
+              duration:"1000",
+            });*/
+            this.listLength = 0;
+            this.oddjobList = [];
+            this.getList()
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      }
     },
   }
 </script>
@@ -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;
+    }
+  }
+}
 </style>
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 @@
      <div class="home_wrapper">
          <div class="header_main">
              零工登记
-             <div class="return_btn" @click="onClickLeft"></div>
+             <div class="return_btn" @click="back"></div>
          </div>
        <van-form  ref="formData">
          <div class="list_main">
@@ -11,38 +11,51 @@
              <p class="tit">添加零工</p>
            </div>
 
-           <van-field
-             readonly
-             clickable
-             label="出工日期"
-             placeholder="请选择"
-             v-model="form.jobTime"
-             @click="showBuildTime = true"
-             input-align="right"
-             right-icon="arrow-down"
-             label-width="auto"
-             required
-             :border="false"
-             :rules="[{ required: true , message:'请选择出工日期' }]"
-           />
-           <van-popup v-model="showBuildTime" position="bottom">
-             <van-datetime-picker
-               type="date"
-               title="选择年月日"
-               :min-date="minDate"
-               :max-date="maxDate"
-               :value="new Date"
-               @confirm="onConfirmBuildTime"
-               @cancel="showBuildTime = false"
+             <field-date-picker
+                     v-model="form.jobTime"
+                     label="出工日期"
+                     placeholder="请选择"
+                     :rules="[{ required: true, message:'请选择出工日期' }]"
+                     formatter="yyyy-MM-dd"
+                     :min-date="minDate"
+                     :max-date="maxDate"
+                     :required="true"
              />
-           </van-popup>
 
            <van-field required :rules="[{ required: true, message: '请填写出工姓名' }]" v-model="form.workerName" label="出工姓名" placeholder="出工姓名" input-align="right" :border="false" />
            <van-field required :rules="[{ required: true, message: '请填写出工事由' }]" v-model="form.workReason" label="出工事由" placeholder="出工事由" input-align="right" :border="false" />
            <van-field required :rules="[{ required: true, message: '请填写记工员' }]" v-model="form.workerNote" label="记工员" placeholder="记工员" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写出工数' }]" v-model="form.workNum" label="出工数" placeholder="出工数" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写工日值' }]" v-model="form.perMoney" label="工日值" placeholder="工日值" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写金额（元）' }]" v-model="form.totalMoney" label="金额（元）" placeholder="金额（元）" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工数' }]" v-model="form.workNum" label="出工数" placeholder="出工数" input-align="right" :border="false" type="number" />
+           <van-field required :rules="[{ required: true, message: '请填写工日值' }]" v-model="form.perMoney" label="工日值" placeholder="工日值" input-align="right" :border="false" type="number" />
+           <van-field required :rules="[{ required: true, message: '请填写金额（元）' }]" v-model="form.totalMoney" label="金额（元）" placeholder="金额（元）" input-align="right" :border="false" type="number" />
+
+           <van-field
+             name="openPic"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic" v-model="form.openPic" multiple/>
+
+             <van-field
+                     name="openPic2"
+                     label="事中公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic2" v-model="form.openPic2" multiple/>
+
+             <van-field
+                     name="openPic3"
+                     label="事后公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic3" v-model="form.openPic3" multiple/>
+
            <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
 
          </div>
@@ -57,16 +70,38 @@
  </template>
  <script>
    import { addOddjob,updateOddjob } from "@/api/sunVillage_info/fixedAssets";
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+   import FieldDatePicker from "@/components/form/FieldDatePicker.vue";
    export default {
-     name: "certificateList",
+     name: "listTouristsRegistrationAdd",
+     components: {FieldDatePicker, CommonUpload},
      data() {
        return {
          minDate:new Date(1900,1,1),
          maxDate: new Date(2050, 12, 31),
 
-         showBuildTime:false,
-         form:{},
-         buildTime:new Date(),
+         form:{
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workerName: null,
+             workReason: null,
+             workerNote: null,
+             workNum: null,
+             perMoney: null,
+             totalMoney: null,
+             remark: null,
+             openPic: null,
+             openPic2: null,
+             openPic3: null,
+             createBy: null,
+             createTime: null,
+             updateBy: null,
+             updateTime: null
+         },
 
          value:''
        };
@@ -75,43 +110,27 @@
 
      },
      methods: {
-       onConfirmBuildTime(data){
-         this.form.jobTime = this.format(data,'yyyy-MM-dd');
-         this.showBuildTime = false;
-       },
        submitForm(){
          this.$refs.formData.validate().then(() => {
-           if (this.form.id) {
-             updateOddjob(this.form).then(response => {
-               if (response.code == 200) {
-                 this.$toast({
-                   icon: 'success',
-                   message: '保存成功',
-                   duration:"1000",
-                 });
-                 setTimeout(function(){
-                   history.back(-1);
-                 },2000)
-               }
-             });
-           } else {
              addOddjob(this.form).then(response => {
-               if (response.code == 200) {
-                 this.$toast({
-                   icon: 'success',
-                   message: '保存成功',
-                   duration:"1000",
-                 });
-                 setTimeout(function(){
-                   history.back(-1);
-                 },2000)
-               }
+                 if (response.code == 200) {
+                     this.$toast({
+                         icon: 'success',
+                         message: '保存成功',
+                         duration:"1000",
+                     });
+                     setTimeout(() => {
+                         this.$router.back();
+                     },2000)
+                 }
              });
-           }
          }).catch(() => {
            this.$notify({ type: 'danger', message: '请填写完整的表单项' });
          });
        },
+       back() {
+           this.$router.back();
+       },
      },
    }
  </script>
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 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             零工登记
+             <div class="return_btn" @click="back"></div>
+         </div>
+       <van-form  ref="formData" :readonly="true">
+         <div class="list_main">
+
+           <van-field v-model="form.jobTime" label="出工日期" input-align="right" :border="false" />
+           <van-field v-model="form.workerName" label="出工姓名" input-align="right" :border="false" />
+           <van-field v-model="form.workReason" label="出工事由" input-align="right" :border="false" />
+           <van-field v-model="form.workerNote" label="记工员" input-align="right" :border="false" />
+           <van-field v-model="form.workNum" label="出工数" input-align="right" :border="false" type="number" />
+           <van-field v-model="form.perMoney" label="工日值" input-align="right" :border="false" type="number" />
+           <van-field v-model="form.totalMoney" label="金额（元）" input-align="right" :border="false" type="number" />
+
+           <van-field
+             name="openPic"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic" v-model="form.openPic" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic2"
+                     label="事中公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic2" v-model="form.openPic2" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic3"
+                     label="事后公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic3" v-model="form.openPic3" multiple :deletable="false" :show-upload="false"/>
+
+           <van-field v-model="form.remark" label="备注" input-align="right" :border="false" />
+
+         </div>
+
+       </van-form>
+     </div>
+ </template>
+ <script>
+ import {addOddjob, getOddjob, updateOddjob} from "@/api/sunVillage_info/fixedAssets";
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+   export default {
+     name: "listTouristsRegistrationDetail",
+     components: {CommonUpload},
+     data() {
+       return {
+         form: {
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workerName: null,
+             workReason: null,
+             workerNote: null,
+             workNum: null,
+             perMoney: null,
+             totalMoney: null,
+             remark: null,
+             openPic: null,
+             openPic2: null,
+             openPic3: null,
+             createBy: null,
+             createTime: null,
+             updateBy: null,
+             updateTime: null
+         },
+         id:''
+       };
+     },
+     created() {
+        this.id = this.$route.query.id;
+        this.getDetail();
+     },
+     methods: {
+       getDetail() {
+         if(!this.id)
+         {
+           this.back();
+           return;
+         }
+
+         getOddjob(this.id).then((resp) => {
+           this.form = resp.data;
+         });
+       },
+       back() {
+         this.$router.back();
+       },
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>
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 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             零工登记
+             <div class="return_btn" @click="back"></div>
+         </div>
+       <van-form  ref="formData">
+         <div class="list_main">
+           <div class="titBox">
+             <img src="../../assets/images/sunVillage_info/add_icon_3.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+             <p class="tit">修改零工</p>
+           </div>
+
+             <field-date-picker
+                     v-model="form.jobTime"
+                     label="出工日期"
+                     placeholder="请选择"
+                     :rules="[{ required: true, message:'请选择出工日期' }]"
+                     formatter="yyyy-MM-dd"
+                     :min-date="minDate"
+                     :max-date="maxDate"
+                     :required="true"
+             />
+
+           <van-field required :rules="[{ required: true, message: '请填写出工姓名' }]" v-model="form.workerName" label="出工姓名" placeholder="出工姓名" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工事由' }]" v-model="form.workReason" label="出工事由" placeholder="出工事由" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写记工员' }]" v-model="form.workerNote" label="记工员" placeholder="记工员" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工数' }]" v-model="form.workNum" label="出工数" placeholder="出工数" input-align="right" :border="false" type="number" />
+           <van-field required :rules="[{ required: true, message: '请填写工日值' }]" v-model="form.perMoney" label="工日值" placeholder="工日值" input-align="right" :border="false" type="number" />
+           <van-field required :rules="[{ required: true, message: '请填写金额（元）' }]" v-model="form.totalMoney" label="金额（元）" placeholder="金额（元）" input-align="right" :border="false" type="number" />
+
+           <van-field
+             name="openPic"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic" v-model="form.openPic" multiple/>
+
+             <van-field
+                     name="openPic2"
+                     label="事中公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic2" v-model="form.openPic2" multiple/>
+
+             <van-field
+                     name="openPic3"
+                     label="事后公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic3" v-model="form.openPic3" multiple/>
+
+           <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
+
+         </div>
+
+         <div style="margin: 16px auto;width: 50%;">
+           <van-button round block type="primary"  @click="submitForm">
+             保存
+           </van-button>
+         </div>
+       </van-form>
+     </div>
+ </template>
+ <script>
+ import {addOddjob, getOddjob, updateOddjob} from "@/api/sunVillage_info/fixedAssets";
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+   import FieldDatePicker from "@/components/form/FieldDatePicker.vue";
+   export default {
+     name: "listTouristsRegistrationEdit",
+     components: {FieldDatePicker, CommonUpload},
+     data() {
+       return {
+         minDate:new Date(1900,1,1),
+         maxDate: new Date(2050, 12, 31),
+
+         form:{
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workerName: null,
+             workReason: null,
+             workerNote: null,
+             workNum: null,
+             perMoney: null,
+             totalMoney: null,
+             remark: null,
+             openPic: null,
+             openPic2: null,
+             openPic3: null,
+             createBy: null,
+             createTime: null,
+             updateBy: null,
+             updateTime: null
+         },
+
+         id:''
+       };
+     },
+     created() {
+       this.id = this.$route.query.id;
+       this.getDetail();
+     },
+     methods: {
+       getDetail() {
+         if(!this.id)
+         {
+           this.back();
+           return;
+         }
+
+         getOddjob(this.id).then((resp) => {
+           this.form = resp.data;
+         });
+       },
+       submitForm(){
+         this.$refs.formData.validate().then(() => {
+           updateOddjob(this.form).then(response => {
+             if (response.code == 200) {
+               this.$toast({
+                 icon: 'success',
+                 message: '保存成功',
+                 duration:"1000",
+               });
+               setTimeout(() => {
+                 this.$router.back();
+               },2000)
+             }
+           });
+         }).catch(() => {
+           this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+         });
+       },
+       back() {
+         this.$router.back();
+       },
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>

From fa66565219d7ff51a62d2f95016ce53529b0b79b Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Sat, 12 Oct 2024 16:30:08 +0800
Subject: [PATCH 04/10] =?UTF-8?q?Task=20=E4=B8=AA=E4=BA=BA=E9=9B=B6?=
 =?UTF-8?q?=E5=B7=A5=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunVillage_info/list_tourists_ranking.vue  | 16 +++++++++++++---
 .../list_tourists_registration.vue             | 18 ++++--------------
 .../list_tourists_registration_detail.vue      |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue
index eb04a406..4c1c7ae6 100644
--- a/src/views/sunVillage_info/list_tourists_ranking.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking.vue
@@ -25,7 +25,7 @@
           <van-row>
             <van-col :span="24">姓名</van-col>
           </van-row>
-          <van-row v-for="(item,index) in applicationList" :key="index">
+          <van-row v-for="(item,index) in applicationList" :key="index" @click.prevent ="viewItem(item.id)">
             <van-col :span="24">{{item.workerName}}</van-col>
           </van-row>
           <div class="name_bg"></div>
@@ -41,7 +41,7 @@
               <van-col :span="5">工日值</van-col>
               <van-col :span="4">金额(元)</van-col>
             </van-row>
-            <van-row v-for="(item,index) in applicationList" :key="index">
+            <van-row v-for="(item,index) in applicationList" :key="index" @click="viewItem(item.id)">
               <van-col :span="5">{{item.workReason}}</van-col>
               <van-col :span="5">{{item.workerNote}}</van-col>
               <van-col :span="5">{{item.workNum}}</van-col>
@@ -104,7 +104,7 @@
       getList(){
         var _this = this;
         setTimeout(() => {
-          console.log(_this.queryParams)
+          //console.log(_this.queryParams)
           listOddjob(_this.queryParams).then(response => {
             _this.listLength = response.total;
             _this.applicationList = response.rows;
@@ -119,6 +119,15 @@
           });
         }, 1000);
       },
+      viewItem(id){
+        this.$router.push({
+          path: "/sunVillage_info/list_tourists_registration_detail",
+          query: {
+            id: id,
+            intent: 'view',
+          },
+        }).catch(() => {});
+      },
     },
   }
 </script>
@@ -378,6 +387,7 @@
       height: 100%;
       position: absolute;
       top: 0;
+      pointer-events: none;
     }
     .name_icon{
       position: absolute;
diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue
index 5e58fdb5..9b45de2a 100644
--- a/src/views/sunVillage_info/list_tourists_registration.vue
+++ b/src/views/sunVillage_info/list_tourists_registration.vue
@@ -64,21 +64,21 @@
         <van-grid :column-num="3">
           <van-grid-item text="查看" @click="viewItem(menuId)">
             <template #icon>
-              <div class="opera_btn view">
+              <div class="menu_btn view">
                 <i class="icon "></i>
               </div>
             </template>
           </van-grid-item>
           <van-grid-item text="修改" @click="editItem(menuId)">
             <template #icon>
-              <div class="opera_btn edit">
+              <div class="menu_btn edit">
                 <i class="icon "></i>
               </div>
             </template>
           </van-grid-item>
           <van-grid-item text="删除" @click="removeItem(menuId)">
             <template #icon>
-              <div class="opera_btn delete">
+              <div class="menu_btn delete">
                 <i class="icon "></i>
               </div>
             </template>
@@ -596,7 +596,7 @@ import {delOddjob, listOddjob, tempWorkerOpenRemove} from "@/api/sunVillage_info
   .clear{
     clear: both;
   }
-.opera_btn{
+.menu_btn{
   width: 52px;
   height: 52px;
   border-radius: 50%;
@@ -634,15 +634,5 @@ import {delOddjob, listOddjob, tempWorkerOpenRemove} from "@/api/sunVillage_info
       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;
-    }
-  }
 }
 </style>
diff --git a/src/views/sunVillage_info/list_tourists_registration_detail.vue b/src/views/sunVillage_info/list_tourists_registration_detail.vue
index c61d3c9c..109b17a4 100644
--- a/src/views/sunVillage_info/list_tourists_registration_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_registration_detail.vue
@@ -42,7 +42,7 @@
              </van-field>
              <CommonUpload name="openPic3" v-model="form.openPic3" multiple :deletable="false" :show-upload="false"/>
 
-           <van-field v-model="form.remark" label="备注" input-align="right" :border="false" />
+           <van-field v-model="form.remark" label="备注" input-align="left" :border="false" />
 
          </div>
 

From 82b0050c9d04e02959f9932e03c3475b99e7c061 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Sat, 12 Oct 2024 16:49:10 +0800
Subject: [PATCH 05/10] =?UTF-8?q?Task=20=E6=B8=B8=E5=AE=A2=E9=9B=B6?=
 =?UTF-8?q?=E5=B7=A5=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_tourists.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue
index b59066fd..07f9a5a4 100644
--- a/src/views/sunVillage_info/list_tourists.vue
+++ b/src/views/sunVillage_info/list_tourists.vue
@@ -53,6 +53,14 @@
               <i class="icon "></i>
             </div>
           </div>
+          <div class="operation" v-if="!showBtn">
+            <div class="opera_btn list" @click="goRanking(item.id,item.openNy)">
+              <i class="icon "></i>
+            </div>
+            <div class="opera_btn view" @click="goDetail(item.id)">
+              <i class="icon "></i>
+            </div>
+          </div>
         </div>
       </van-list>
     </div>
@@ -93,7 +101,7 @@
         projectIndex:'',
         showBtn:true,
         nowYear:new Date().getFullYear(),
-        yearList:[]
+        yearList:[],
       };
     },
     created() {

From 99ff9aee2bfdf08334d0f729a77de58023bd111a Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Sat, 12 Oct 2024 17:09:54 +0800
Subject: [PATCH 06/10] =?UTF-8?q?Task=20=E6=B8=B8=E5=AE=A2=E9=9B=B6?=
 =?UTF-8?q?=E5=B7=A5=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_tourists_registration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue
index 9b45de2a..11de4b7a 100644
--- a/src/views/sunVillage_info/list_tourists_registration.vue
+++ b/src/views/sunVillage_info/list_tourists_registration.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="home_wrapper">
         <div class="header_main">
-            新增零工登记
+            零工登记
             <div class="return_btn" @click="onClickLeft"></div>
             <div class="add_btn" v-show="showBtn" @click="$router.push({path:'/sunVillage_info/list_tourists_registration_add'})"></div>
         </div>

From 2ab6b94d30cd64c70a74799b6e859313ff5d7da8 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Wed, 16 Oct 2024 14:49:29 +0800
Subject: [PATCH 07/10] =?UTF-8?q?Task=20master=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |   9 +
 src/permission.js                             |   4 +-
 src/router/index.js                           |  20 +-
 src/views/sunVillage_info/list_tourists.vue   |   5 +-
 .../sunVillage_info/list_tourists_ranking.vue |   2 +-
 .../list_tourists_ranking_lite.vue            | 369 ++++++++++++++++++
 .../list_tourists_registration_detail.vue     |   2 +-
 ...t_tourists_registration_detail_visitor.vue | 190 +++++++++
 8 files changed, 596 insertions(+), 5 deletions(-)
 create mode 100644 src/views/sunVillage_info/list_tourists_ranking_lite.vue
 create mode 100644 src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index f49895d9..b7bd6428 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -425,6 +425,15 @@ export function listOddjob(query) {
   })
 }
 
+// 查询零工登记详细
+export function getOddjobDetail(bookId, id) {
+  return request({
+    url: '/open/villageAffairs/public/oddjobDetail',
+    method: 'get',
+    params: {bookId, id},
+  })
+}
+
 // 新增零工登记
 export function addOddjob(data) {
   return request({
diff --git a/src/permission.js b/src/permission.js
index bbae94cc..d3f2d4ce 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -95,7 +95,9 @@ const whiteList = [
   '/sunVillage_info/list_finance_detail',  //详情页
   '/sunVillage_info/list_photo_detail',  //详情页
   '/sunVillage_info/list_finance_ranking',   //详情页
-  '/sunVillage_info/list_tourists_ranking',   //详情页
+  '/sunVillage_info/list_tourists_ranking',   //零工排行榜
+  '/sunVillage_info/list_tourists_ranking_lite',   //零工排行榜
+  '/sunVillage_info/list_tourists_registration_detail_visitor',   //零工详情页
   '/sunVillage_info/login_code',   //详情页
   '/sunVillage_info/index_code_rights',   //详情页
   '/sunVillage_info/list_vote',   //详情页
diff --git a/src/router/index.js b/src/router/index.js
index 308f244c..0a49b4fd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3633,7 +3633,7 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_issues_edit'], resolve)
   },
-  { ////阳光村务（新）-- 合同信息
+  { ////阳光村务（新）-- 零工公开榜
     path: '/sunVillage_info/list_tourists_ranking',
     name: 'sunVillageInfoListTouristsRanking',
     meta: {
@@ -3642,6 +3642,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve)
   },
+  { ////阳光村务（新）-- 零工公开榜(精简)
+    path: '/sunVillage_info/list_tourists_ranking_lite',
+    name: 'sunVillageInfoListTouristsRankingLite',
+    meta: {
+      title: '零工公式公布榜',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking_lite'], resolve)
+  },
   { ////阳光村务（新）-- 零工登记
     path: '/sunVillage_info/list_tourists_registration',
     name: 'sunVillageInfoListTouristsRegistration',
@@ -3669,6 +3678,15 @@ export const constantRoutes = [
       },
       component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_detail'], resolve)
   },
+  { ////阳光村务（新）-- 零工登记详情(游客)
+    path: '/sunVillage_info/list_tourists_registration_detail_visitor',
+    name: 'sunVillageInfoListTouristsRegistrationDetailVisitor',
+    meta: {
+      title: '查看零工登记',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_detail_visitor'], resolve)
+  },
   { ////阳光村务（新）-- 零工登记修改
       path: '/sunVillage_info/list_tourists_registration_edit',
       name: 'sunVillageInfoListTouristsRegistrationEdit',
diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue
index 07f9a5a4..0486bebb 100644
--- a/src/views/sunVillage_info/list_tourists.vue
+++ b/src/views/sunVillage_info/list_tourists.vue
@@ -102,11 +102,13 @@
         showBtn:true,
         nowYear:new Date().getFullYear(),
         yearList:[],
+        visitor: false,
       };
     },
     created() {
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
+      this.visitor = this.$route.query.type == 'code';
       if (this.$route.query.type == 'code'){
         this.showBtn = false;
       }
@@ -187,7 +189,8 @@
         this.$router.push({path:'/sunVillage_info/list_tourists_edit',query: {id:id,type:'finance'}})
       },
       goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}})
+        const url = this.visitor ? '/sunVillage_info/list_tourists_ranking_lite' : '/sunVillage_info/list_tourists_ranking';
+        this.$router.push({path:url,query: {id:id,time:time}})
       },
       goRemove(id){
         this.$dialog.alert({
diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue
index 4c1c7ae6..cce95d2f 100644
--- a/src/views/sunVillage_info/list_tourists_ranking.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking.vue
@@ -121,7 +121,7 @@
       },
       viewItem(id){
         this.$router.push({
-          path: "/sunVillage_info/list_tourists_registration_detail",
+          path: "/sunVillage_info/list_tourists_registration_detail_visitor",
           query: {
             id: id,
             intent: 'view',
diff --git a/src/views/sunVillage_info/list_tourists_ranking_lite.vue b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
new file mode 100644
index 00000000..49906e35
--- /dev/null
+++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="home_wrapper">
+    <div
+      class="header_main"
+      :style="`background-image:url(${require('@/assets/images/sunVillage_info/list_head.png')})`"
+    >
+      零工公开榜
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+
+    <p class="top_head_title">{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份</p>
+
+    <div class="list_main">
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList('+1')"
+        >
+          <!----1-->
+          <div class="item" v-for="(item,index) in applicationList" :key="index" >
+            <div class="info" @click="viewItem(item.id)">
+              <div class="title">
+                <p class="news_title">{{item.workReason}}</p>
+              </div>
+              <div class="time">
+                <div class="icon_time"></div>
+                {{item.jobTime}}
+              </div>
+            </div>
+            <div class="operation">
+              <div class="opera_btn view" @click="viewItem(item.id)">
+                <i class="icon "></i>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-pull-refresh>
+    </div>
+    <!--        <div class="bottom_tips">-->
+    <!--            <span class="xs">已经到底啦</span>-->
+    <!--        </div>-->
+  </div>
+</template>
+
+<script>
+import {listOddjob} from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "sunVillageInfoListTouristsRankingLite",
+    data() {
+      return {
+        refreshing: false,
+        applicationList:[],
+        loading: false,
+        finished: false,
+        total: 0,
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'jobNy',
+          isAsc:'desc',
+          year:'',
+        },
+        yearMonth:[],
+        deptName:''
+      };
+    },
+    created() {
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      this.deptName = Cookies.get('deptName');
+      this.queryParams.yearMonth = this.$route.query.time;
+      this.yearMonth = this.$route.query.time.split('-')
+      this.getList();
+    },
+    methods: {
+      getList(target){
+        var _this = this;
+        setTimeout(() => {
+          let type = typeof (target);
+          console.log(type, target);
+          if(target && this.finished)
+            return;
+          if (target === 0) {
+            this.refreshing = true;
+            this.finished = true;
+            this.total = 0;
+            this.queryParams.pageNum = 1;
+            this.applicationList = [];
+          }
+          else if (type === 'number')
+            this.queryParams.pageNum = target;
+          else if (type === 'string') {
+            this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+          }
+          else
+          {
+            this.refreshing = true;
+            this.finished = true;
+            this.total = 0;
+            this.queryParams.pageNum = 1;
+            this.applicationList = []
+          }
+          //console.log(_this.queryParams)
+          listOddjob(_this.queryParams).then(response => {
+            if (response.rows.length === 0) {
+              this.finished = true;
+              return;
+            }
+            for (var i = 0; i < response.rows.length; i++) {
+              this.applicationList.push(response.rows[i]);
+            }
+            this.total += response.rows.length;
+            this.finished = this.total >= response.total;
+          }).finally(() => {
+            this.loading = false;
+            this.refreshing = false;
+          });
+        }, 1000);
+      },
+      viewItem(id){
+        this.$router.push({
+          path: "/sunVillage_info/list_tourists_registration_detail_visitor",
+          query: {
+            id: id,
+            intent: 'view',
+          },
+        }).catch(() => {});
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main{
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+    .record_main{
+      padding:30px 22px;
+      .record_det{
+        height: 38px;
+        line-height: 38px;
+        display: flex;
+        justify-content:space-between;
+        .year_l{
+          font-size: 30px;
+          display: flex;
+          align-items: center;
+          color: #858585;
+
+          .unit{
+            padding-left: 5px;
+          }
+          .icon{
+            width: 23px;
+            height: 12px;
+            display: block;
+            background: url('../../assets/images/sunVillage_info/list_icon_1.png') no-repeat;
+            background-size: 100% 100%;
+            margin-bottom: 4px;
+            margin-right: 8px;
+            &.zk {
+              transform: rotate(0deg)
+            }
+            &.ss{
+              transform: rotate(180deg)
+            }
+
+          }
+        }
+        .total_r{
+          font-size: 26px;
+          letter-spacing: 2px;
+        }
+      }
+      .record_list{
+        display: flex;
+        flex-flow: wrap;
+        margin-top: 12PX;
+        .flex_block{
+          font-size: 30px;
+          color: #878787;
+          padding-right: 30px;
+          &.current{
+            color: #4199fe;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+    .list_main{
+      padding:0 22px;
+      .item{
+        height: 140px;
+        border-radius: 30px;
+        background: #fff;
+        box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+        padding:25px 32px;
+        display: flex;
+        margin-bottom: 20px;
+        justify-content: space-between;
+        .info{
+          .title{
+            display: flex;
+            font-size: 32px;
+            align-items: center;
+            height: 58px;
+            .icon_box{
+              width: 34px;
+              display: block;
+              height: 30px;
+              background: url('../../assets/images/sunVillage_info/list_icon_2.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+              flex-shrink: 0;
+            }
+            .news_title{
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 1;
+              word-break: break-all;
+              overflow: hidden;
+            }
+            .tips_mark{
+              width: 34px;
+              height: 34px;
+              background: #fa0c0c;
+              border-radius: 8px;
+              font-size: 24px;
+              color: #fff;
+              text-align: center;
+              line-height: 34px;
+              margin-left: 10px;
+              flex-shrink: 0;
+            }
+          }
+          .time{
+            font-size: 24px;
+            color: #858585;
+            display: flex;
+            align-items: center;
+            height: 30px;
+            margin-top: 6px;
+            .icon_time{
+              width: 25px;
+              height: 25px;
+              background: url('../../assets/images/sunVillage_info/list_icon_4.png') no-repeat;
+              background-size: 100% 100%;
+              margin-right: 10px;
+            }
+          }
+        }
+        .operation{
+          display: flex;
+          align-items: center;
+          justify-content: right;
+          text-align: right;
+          .opera_btn{
+            width: 52px;
+            height: 52px;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content:center;
+
+            &.delete{
+              background:#df0707;
+              margin-left: 10PX;
+              .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;
+              margin-left: 10PX;
+              .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;
+              margin-left: 10PX;
+              .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;
+              margin-left: 10PX;
+              .icon {
+                width: 29px;
+                height: 21px;
+                background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+                background-size: 100% 100%;
+                display: block;
+              }
+            }
+          }
+        }
+      }
+
+    }
+    .bottom_tips{
+      font-size: 24px;
+      color: #a7a6a6;
+      text-align: center;
+      margin-top: 32px;
+      background: url('../../assets/images/sunVillage_info/list_icon_8.png') center center no-repeat;
+      background-size: 260px 2px;
+      .xs{
+        padding:0 8px;
+        background: #e9e9e9;
+      }
+    }
+  }
+  .top_head_title{
+    font-size: 16PX;
+    text-align: center;
+    padding: 15PX 0;
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_tourists_registration_detail.vue b/src/views/sunVillage_info/list_tourists_registration_detail.vue
index 109b17a4..b7026d48 100644
--- a/src/views/sunVillage_info/list_tourists_registration_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_registration_detail.vue
@@ -50,7 +50,7 @@
      </div>
  </template>
  <script>
- import {addOddjob, getOddjob, updateOddjob} from "@/api/sunVillage_info/fixedAssets";
+ import {getOddjob, } from "@/api/sunVillage_info/fixedAssets";
    import CommonUpload from "@/components/form/CommonUpload.vue";
    export default {
      name: "listTouristsRegistrationDetail",
diff --git a/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue
new file mode 100644
index 00000000..8fae2282
--- /dev/null
+++ b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue
@@ -0,0 +1,190 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             零工登记
+             <div class="return_btn" @click="back"></div>
+         </div>
+       <van-form  ref="formData" :readonly="true">
+         <div class="list_main">
+
+           <van-field v-model="form.jobTime" label="出工日期" input-align="right" :border="false" />
+<!--           <van-field v-model="form.workerName" label="出工姓名" input-align="right" :border="false" />-->
+           <van-field v-model="form.workReason" label="出工事由" input-align="right" :border="false" />
+<!--           <van-field v-model="form.workerNote" label="记工员" input-align="right" :border="false" />
+           <van-field v-model="form.workNum" label="出工数" input-align="right" :border="false" type="number" />
+           <van-field v-model="form.perMoney" label="工日值" input-align="right" :border="false" type="number" />
+           <van-field v-model="form.totalMoney" label="金额（元）" input-align="right" :border="false" type="number" />-->
+
+           <van-field
+             name="openPic"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic" v-model="form.openPic" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic2"
+                     label="事中公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic2" v-model="form.openPic2" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic3"
+                     label="事后公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic3" v-model="form.openPic3" multiple :deletable="false" :show-upload="false"/>
+
+<!--           <van-field v-model="form.remark" label="备注" input-align="left" :border="false" />-->
+
+         </div>
+
+       </van-form>
+     </div>
+ </template>
+ <script>
+ import {getOddjob, getOddjobDetail,} from "@/api/sunVillage_info/fixedAssets";
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+ import Cookies from "js-cookie";
+   export default {
+     name: "listTouristsRegistrationDetailVisitor",
+     components: {CommonUpload},
+     data() {
+       return {
+         form: {
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workerName: null,
+             workReason: null,
+             workerNote: null,
+             workNum: null,
+             perMoney: null,
+             totalMoney: null,
+             remark: null,
+             openPic: null,
+             openPic2: null,
+             openPic3: null,
+             createBy: null,
+             createTime: null,
+             updateBy: null,
+             updateTime: null
+         },
+         id:'',
+       };
+     },
+     created() {
+        this.id = this.$route.query.id;
+        this.getDetail();
+     },
+     methods: {
+       getDetail() {
+         if(!this.id)
+         {
+           this.back();
+           return;
+         }
+
+         let bookId = Cookies.get('bookId');
+         getOddjobDetail(bookId, this.id).then((resp) => {
+           this.form = resp.data;
+         });
+       },
+       back() {
+         this.$router.back();
+       },
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>

From b16e2b44cf822ccae5ef5d19ecc17fd55d353886 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Wed, 16 Oct 2024 15:02:21 +0800
Subject: [PATCH 08/10] =?UTF-8?q?Task=20=E9=9B=B6=E5=B7=A5=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/subcontract.js        | 19 +++++++++++++++++++
 .../list_tourists_ranking_lite.vue            | 12 ++++++------
 ...t_tourists_registration_detail_visitor.vue |  5 +++--
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 src/api/sunVillage_info/subcontract.js

diff --git a/src/api/sunVillage_info/subcontract.js b/src/api/sunVillage_info/subcontract.js
new file mode 100644
index 00000000..91ac0f9d
--- /dev/null
+++ b/src/api/sunVillage_info/subcontract.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询零工事项列表
+export function registrationList(query) {
+  return request({
+    url: '/open/villageAffairs/public/registrationList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询零工事项详细
+export function registrationDetail(bookId, id) {
+  return request({
+    url: '/open/villageAffairs/public/registrationDetail',
+    method: 'get',
+    params: {bookId, id},
+  })
+}
diff --git a/src/views/sunVillage_info/list_tourists_ranking_lite.vue b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
index 49906e35..6dbb7a22 100644
--- a/src/views/sunVillage_info/list_tourists_ranking_lite.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
@@ -19,8 +19,8 @@
           @load="getList('+1')"
         >
           <!----1-->
-          <div class="item" v-for="(item,index) in applicationList" :key="index" >
-            <div class="info" @click="viewItem(item.id)">
+          <div class="item" v-for="(item,index) in applicationList" :key="index" @click="viewItem(item.id)" >
+            <div class="info">
               <div class="title">
                 <p class="news_title">{{item.workReason}}</p>
               </div>
@@ -30,7 +30,7 @@
               </div>
             </div>
             <div class="operation">
-              <div class="opera_btn view" @click="viewItem(item.id)">
+              <div class="opera_btn view" @click.prevent="viewItem(item.id)">
                 <i class="icon "></i>
               </div>
             </div>
@@ -46,8 +46,8 @@
 
 <script>
 import {listOddjob} from "@/api/sunVillage_info/fixedAssets";
+import {registrationList} from "@/api/sunVillage_info/subcontract";
   import Cookies from "js-cookie";
-  import request from '@/utils/request'
   export default {
     name: "sunVillageInfoListTouristsRankingLite",
     data() {
@@ -60,7 +60,7 @@ import {listOddjob} from "@/api/sunVillage_info/fixedAssets";
         queryParams:{
           pageNum:1,
           pageSize:10,
-          orderByColumn:'jobNy',
+          orderByColumn:'jobTime',
           isAsc:'desc',
           year:'',
         },
@@ -105,7 +105,7 @@ import {listOddjob} from "@/api/sunVillage_info/fixedAssets";
             this.applicationList = []
           }
           //console.log(_this.queryParams)
-          listOddjob(_this.queryParams).then(response => {
+          registrationList(_this.queryParams).then(response => {
             if (response.rows.length === 0) {
               this.finished = true;
               return;
diff --git a/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue
index 8fae2282..3f590887 100644
--- a/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue
+++ b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue
@@ -50,7 +50,8 @@
      </div>
  </template>
  <script>
- import {getOddjob, getOddjobDetail,} from "@/api/sunVillage_info/fixedAssets";
+ import {getOddjobDetail,} from "@/api/sunVillage_info/fixedAssets";
+ import {registrationDetail} from "@/api/sunVillage_info/subcontract";
    import CommonUpload from "@/components/form/CommonUpload.vue";
  import Cookies from "js-cookie";
    export default {
@@ -96,7 +97,7 @@
          }
 
          let bookId = Cookies.get('bookId');
-         getOddjobDetail(bookId, this.id).then((resp) => {
+         registrationDetail(bookId, this.id).then((resp) => {
            this.form = resp.data;
          });
        },

From 045f43ed27fb112550ff8fd95c348ad77eadfcfa Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Wed, 16 Oct 2024 15:06:38 +0800
Subject: [PATCH 09/10] =?UTF-8?q?Task=20=E9=9B=B6=E5=B7=A5=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_tourists_ranking.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue
index cce95d2f..4c1c7ae6 100644
--- a/src/views/sunVillage_info/list_tourists_ranking.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking.vue
@@ -121,7 +121,7 @@
       },
       viewItem(id){
         this.$router.push({
-          path: "/sunVillage_info/list_tourists_registration_detail_visitor",
+          path: "/sunVillage_info/list_tourists_registration_detail",
           query: {
             id: id,
             intent: 'view',

From 24af5b062a32e2bc989e0066953d623808d8223f Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 18 Oct 2024 12:12:39 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=9C=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/signUp.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 8e3142fc..76dc8739 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -29,9 +29,9 @@
       <van-row style="">
         <h2 style="margin-bottom:10px;">1.竞买人条件确认</h2>
         <p style="margin-bottom:10px;">· 已阅读并知晓：
-          <span style="color:#C21F3A" @click="show1=true">《乳山市农村产权交易项目报名服务协议》</span>
+          <span style="color:#C21F3A" @click="show1=true">《农村产权交易项目报名服务协议》</span>
         </p>
-        <van-dialog v-model="show1" title="乳山市农村产权交易项目报名服务协议" confirmButtonText="关闭">
+        <van-dialog v-model="show1" title="农村产权交易项目报名服务协议" confirmButtonText="关闭">
 
           <div class="dialog_content_center" v-html="fwxyConfig"></div>