优化

src/api/sunVillage_info/fixedAssets.js

@@ -262,3 +262,46 @@ export function majorEventOpenRemove(id) {
     method: 'get'
   })
 }
+
+// 查询零工登记列表
+export function listOddjob(query) {
+  return request({
+    url: '/subcontract/oddjob/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增零工登记
+export function addOddjob(data) {
+  return request({
+    url: '/subcontract/oddjob/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改零工登记
+export function updateOddjob(data) {
+  return request({
+    url: '/subcontract/oddjob/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询零工登记详细
+export function getOddjob(id) {
+  return request({
+    url: '/subcontract/oddjob/get/' + id,
+    method: 'get'
+  })
+}
+
+// 删除零工登记
+export function delOddjob(id) {
+  return request({
+    url: '/subcontract/oddjob/remove/' + id,
+    method: 'get'
+  })
+}

src/router/index.js

@@ -3088,6 +3088,42 @@ export const constantRoutes = [
       hidden: true,
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_register',
+    name: 'sunVillageInfoListRegister',
+    meta: {
+      title: '零工登记',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_register'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_register_add',
+    name: 'sunVillageInfoListRegisterAdd',
+    meta: {
+      title: '新增零工登记',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_register_add'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_register_edit',
+    name: 'sunVillageInfoListRegisterEdit',
+    meta: {
+      title: '新增零工登记',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_register_edit'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_register_detail',
+    name: 'sunVillageInfoListRegisterDetail',
+    meta: {
+      title: '查看零工登记',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve)
   }
 ];
 

src/views/sunVillage_info/index.vue

@@ -37,6 +37,7 @@
             <div class="nav_list">
                 <router-link :to="{name:'sunVillageInfoListFinance'}" class="nav_item n_1">财务公开榜</router-link>
                 <router-link :to="{name:'sunVillageInfoListTourists'}" class="nav_item n_2">零工公开榜</router-link>
+                <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_6">零工登记</router-link>
                 <router-link :to="{name:'sunVillageInfoListIssues'}" class="nav_item n_3">重大事项</router-link>
                 <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_4">固定资产</router-link>
                 <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_5">合同登记</router-link>
@@ -246,7 +247,7 @@
                 align-items: center;
                 justify-content: center;
                 padding-top: 120px;
-                &:nth-child(3){
+                &:nth-child(3n){
                     margin-right: 0;
                 }
                 &.n_1{
@@ -269,6 +270,10 @@
                     background: url('../../assets/images/sunVillage_info/index_block_5.png') no-repeat;
                     background-size: 100% 100%;
                 }
+                &.n_6 {
+                    background: url('../../assets/images/sunVillage_info/index_block_6.png') no-repeat;
+                    background-size: 100% 100%;
+                }
             }
         }
     }

src/views/sunVillage_info/list_finance.vue

@@ -180,6 +180,7 @@
         this.$dialog.alert({
           title: '提示',
           message: '确认删除？',
+          showCancelButton:true,
         })
           .then(() => {
             openRemove(id).then(response => {

src/views/sunVillage_info/list_finance_add.vue

@@ -43,7 +43,7 @@
              </template>
            </van-field>
 
-           <van-field required readonly input-align="right" :border="false" >
+           <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>
@@ -302,5 +302,8 @@
   /deep/ .van-cell--required::before{
     left: 85PX;
   }
+  /deep/ .van-field__error-message{
+    display: none;
+  }
 }
 </style>

src/views/sunVillage_info/list_finance_edit.vue

@@ -43,7 +43,7 @@
              </template>
            </van-field>
 
-           <van-field required readonly input-align="right" :border="false" >
+           <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>
@@ -332,5 +332,8 @@
   /deep/ .van-cell--required::before{
     left: 85PX;
   }
+  /deep/ .van-field__error-message{
+    display: none;
+  }
 }
 </style>

src/views/sunVillage_info/list_issues.vue

@@ -173,6 +173,7 @@
         this.$dialog.alert({
           title: '提示',
           message: '确认删除？',
+          showCancelButton:true,
         })
           .then(() => {
             majorEventOpenRemove(id).then(response => {

src/views/sunVillage_info/list_issues_add.vue

@@ -43,7 +43,7 @@
           </template>
         </van-field>
 
-        <van-field required readonly input-align="right" :border="false" >
+        <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>
@@ -309,5 +309,8 @@
     /deep/ .van-cell--required::before{
       left: 85PX;
     }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
   }
 </style>

src/views/sunVillage_info/list_issues_edit.vue

@@ -43,7 +43,7 @@
              </template>
            </van-field>
 
-           <van-field required readonly input-align="right" :border="false" >
+           <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>
@@ -338,5 +338,8 @@
   /deep/ .van-cell--required::before{
     left: 85PX;
   }
+  /deep/ .van-field__error-message{
+    display: none;
+  }
 }
 </style>

src/views/sunVillage_info/list_register.vue

@@ -0,0 +1,428 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      零工登记
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="goAdd" v-show="showBtn"></div>
+    </div>
+<!--    <div class="record_main">-->
+<!--      <div class="record_det">-->
+<!--        <div class="year_l" @click="tabShow"><i :class="{'icon':true , 'zk':!showTab ,  'ss':showTab } "></i>{{queryParams.year == '' ? '全部': queryParams.year}}<span class="unit">{{queryParams.year == '' ? '': '年'}}</span></div>-->
+<!--        <div class="total_r">共{{listLength}}条公告</div>-->
+<!--      </div>-->
+<!--      <div class="record_list" v-if="showTab">-->
+<!--        <div :class="{'flex_block':true , 'current':queryParams.year == ''}" @click="tabClick('')">全部</div>-->
+<!--        <div :class="{'flex_block':true , 'current':queryParams.year == '2022'}" @click="tabClick('2022')">2022</div>-->
+<!--        <div :class="{'flex_block':true , 'current':queryParams.year == '2021'}" @click="tabClick('2021')">2021</div>-->
+<!--        <div :class="{'flex_block':true , 'current':queryParams.year == '2020'}" @click="tabClick('2020')">2020</div>-->
+<!--      </div>-->
+<!--    </div>-->
+    <div class="list_main">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
+        <!----1-->
+        <div class="item" v-for="(item,index) in applicationList" :key="index" >
+          <div class="info" @click="goDetail(item.id)">
+            <div class="title">
+              <i class="icon_box"></i>
+              <p class="news_title">{{item.workerName}}</p>
+<!--              <p class="tips_mark" v-if="index==0">新</p>-->
+              <div class="money">￥{{item.totalMoney}}</div>
+            </div>
+            <div class="time">
+              <div class="icon_time"></div>{{item.jobTime}}
+            </div>
+          </div>
+          <div class="operation">
+            <!-- delete 删除 edit编辑 view查看 -->
+            <div class="opera_btn edit" @click="goEdit(item.id)" v-show="showBtn">
+              <i class="icon "></i>
+            </div>
+            <div class="opera_btn delete" @click="goRemove(item.id)" v-show="showBtn">
+              <i class="icon"></i>
+            </div>
+<!--            <div class="opera_btn list" @click="goRanking(item.id,item.openNy)" v-show="!showBtn">-->
+<!--              <i class="icon "></i>-->
+<!--            </div>-->
+<!--            <div class="opera_btn view" @click="goDetail(item.id)" v-show="!showBtn">-->
+<!--              <i class="icon "></i>-->
+<!--            </div>-->
+          </div>
+        </div>
+      </van-list>
+    </div>
+    <!--        <div class="bottom_tips">-->
+    <!--            <span class="xs">已经到底啦</span>-->
+    <!--        </div>-->
+  </div>
+</template>
+
+<script>
+  import { listOddjob , delOddjob } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        applicationList:[],
+        applicationListSecond:[],
+        assetStatusOptions:[],
+        auditStatus:[],
+        loading: false,
+        finished: false,
+        show: false,
+        showTab: false,
+        fileList:[],
+        listLength:'0',
+        searchInput:'',
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'createTime',
+          isAsc:'desc',
+          year:'',
+        },
+        uploadFiles1:[],
+        projectId:'',
+        projectIndex:'',
+        showBtn:true,
+      };
+    },
+    created() {
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      if (this.$route.query.type == 'code'){
+        this.showBtn = false;
+      }
+    },
+    methods: {
+      getList(){
+        var _this = this;
+        setTimeout(() => {
+          console.log(_this.queryParams)
+          listOddjob(_this.queryParams).then(response => {
+            _this.listLength = response.total;
+            _this.applicationList = response.rows;
+
+            if(_this.applicationList.length >= response.total){
+              _this.finished = true;
+              return;
+            }else{
+              _this.loading = false;
+              _this.queryParams.pageNum += 1 ;
+            }
+          });
+        }, 1000);
+      },
+      tabClick(year){
+        this.queryParams.year = year ;
+        this.applicationList = [];
+        this.getList();
+      },
+      tabShow(){
+        this.showTab = !this.showTab;
+      },
+      /** 删除按钮操作 */
+      handleDelete(row,index) {
+        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
+        if (assetStatus === '2' || assetStatus === '3') {
+          this.$notify({
+            message: "不允许删除已出售或已报废的资产",
+            type: "warning",
+          });
+          return;
+        }
+        let useType = row.useType;
+        if(useType == 3) {
+          this.$notify({
+            message: "出租或出借的资产不允许删除",
+            type: "warning",
+          });
+          return ;
+        }
+        const ids = row.id || this.ids;
+
+        this.$dialog.alert(
+          {
+            message:'是否确认删除固定资产?',
+            title:"警告",
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+          }
+        )
+          .then(function () {
+            return delPermanent(ids);
+          })
+          .then(() => {
+            this.applicationList.splice(index, 1);
+            this.$notify({ type: 'success', message: '删除成功' });
+          });
+      },
+      goAdd(){
+        this.$router.push('/sunVillage_info/list_register_add')
+      },
+      goDetail(id){
+        this.$router.push({path:'/sunVillage_info/list_register_detail',query: {id:id}})
+      },
+      goEdit(id){
+        this.$router.push({path:'/sunVillage_info/list_register_edit',query: {id:id}})
+      },
+      goRanking(id,time){
+        this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}})
+      },
+      goRemove(id){
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认删除？',
+          showCancelButton:true,
+        })
+          .then(() => {
+            delOddjob(id).then(response => {
+              this.$notify({ type: 'success', message: '删除成功' });
+              this.getList()
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+
+      }
+    },
+  }
+</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: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;
+        .info{
+          flex:0 0 450px;
+          .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;
+            }
+            .news_title{
+              max-width:416px;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              -o-text-overflow: ellipsis;
+            }
+            .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;
+            }
+            .money{
+              font-size: 14PX;
+              color: red;
+              margin-left: auto;
+            }
+          }
+          .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{
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          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: 28px;
+              .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;
+              margin-left: 28px;
+              .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;
+              }
+            }
+          }
+        }
+      }
+
+    }
+    .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;
+      }
+    }
+  }
+</style>

src/views/sunVillage_info/list_register_add.vue

@@ -0,0 +1,232 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      新增零工登记
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn"></div>
+    </div>
+    <van-form @submit="onSubmit">
+      <div class="list_main">
+
+        <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
+            v-model="jobTime"
+            type="year-month"
+            title="选择年月日"
+            @confirm="onConfirmOpenNy"
+            @cancel="showBuildTime = false"
+          />
+        </van-popup>
+
+        <van-field required label="出工姓名" v-model="form.workerName" placeholder="请输入出工姓名" :rules="[{ required: true , message:'请输入出工姓名' }]" input-align="right" :border="false" />
+
+        <van-field required label="出工事由" v-model="form.workReason" placeholder="请输入出工事由" :rules="[{ required: true , message:'请输入出工事由' }]" input-align="right" :border="false" />
+
+        <van-field required label="记工员" v-model="form.workerNote" placeholder="请输入记工员" :rules="[{ required: true , message:'请输入记工员' }]" input-align="right" :border="false" />
+
+        <van-field required label="出工数" v-model="form.workNum" placeholder="请输入出工数" :rules="[{ required: true , message:'请输入出工数' }]" input-align="right" :border="false" />
+
+        <van-field required label="工日值" v-model="form.perMoney" placeholder="请输入工日值" :rules="[{ required: true , message:'请输入工日值' }]" input-align="right" :border="false" />
+
+        <van-field required label="金额(元)" v-model="form.totalMoney" placeholder="请输入金额(元)" :rules="[{ required: true , message:'请输入金额' }]" input-align="right" :border="false" />
+
+        <van-field label="备注" v-model="form.remark" placeholder="请输入备注" input-align="right" :border="false" />
+
+      </div>
+
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          保存
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { addOddjob } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        showBuildTime:false,
+        form:{
+          jobTime:this.format(new Date(),'yyyy-MM-dd'),
+          workerName:'',
+          workReason:'',
+          workerNote:'',
+          workNum:'',
+          perMoney:'',
+          totalMoney:'',
+          remark:'',
+        },
+        openPic:[],
+        fileList:[],
+        fileList1:[],
+        jobTime:new Date(),
+        type:'',
+        openFile:[],
+        openFileList:[],
+        queryParams:{
+          bookId:'',
+          deptId:''
+        },
+        openFile2:[],
+        openPic2:[],
+      };
+    },
+    created() {
+      this.type = this.$route.query.type;
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+    },
+    methods: {
+      onSubmit(){
+        var that = this;
+        addOddjob(that.form).then((r1) => {
+          if (r1.code == 200){
+            that.$notify({ type: 'success', message: '新增成功' });
+            setTimeout(function(){
+              history.back(-1);
+            },2000)
+          }
+        })
+      },
+      onConfirmOpenNy(data){
+        this.form.jobTime = this.format(data,'yyyy-MM-dd');
+        this.jobTime = data;
+        this.showBuildTime = false;
+      },
+
+    },
+  }
+</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;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .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: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0PX;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>

src/views/sunVillage_info/list_register_detail.vue

@@ -0,0 +1,225 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      查看零工登记
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn"></div>
+    </div>
+    <van-form @submit="onSubmit">
+      <div class="list_main">
+
+        <van-field
+          readonly
+          clickable
+          label="出工日期"
+          placeholder="请选择"
+          v-model="form.jobTime"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :border="false"
+          :rules="[{ required: true , message:'请选择出工日期' }]"
+        />
+
+        <van-field readonly required label="出工姓名" v-model="form.workerName" placeholder="请输入出工姓名" :rules="[{ required: true , message:'请输入出工姓名' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="出工事由" v-model="form.workReason" placeholder="请输入出工事由" :rules="[{ required: true , message:'请输入出工事由' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="记工员" v-model="form.workerNote" placeholder="请输入记工员" :rules="[{ required: true , message:'请输入记工员' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="出工数" v-model="form.workNum" placeholder="请输入出工数" :rules="[{ required: true , message:'请输入出工数' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="工日值" v-model="form.perMoney" placeholder="请输入工日值" :rules="[{ required: true , message:'请输入工日值' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="金额(元)" v-model="form.totalMoney" placeholder="请输入金额(元)" :rules="[{ required: true , message:'请输入金额' }]" input-align="right" :border="false" />
+
+        <van-field readonly required label="备注" v-model="form.remark" placeholder="请输入备注" :rules="[{ required: true , message:'请输入备注' }]" input-align="right" :border="false" />
+
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { addOddjob , getOddjob , updateOddjob } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        showBuildTime:false,
+        form:{
+          jobTime:this.format(new Date(),'yyyy-MM-dd'),
+          workerName:'',
+          workReason:'',
+          workerNote:'',
+          workNum:'',
+          perMoney:'',
+          totalMoney:'',
+          remark:'',
+        },
+        openPic:[],
+        fileList:[],
+        fileList1:[],
+        jobTime:new Date(),
+        type:'',
+        openFile:[],
+        openFileList:[],
+        queryParams:{
+          id:'',
+          bookId:'',
+          deptId:''
+        },
+        openFile2:[],
+        openPic2:[],
+      };
+    },
+    created() {
+      this.type = this.$route.query.type;
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      this.queryParams.id = this.$route.query.id;
+      this.getDetail();
+    },
+    methods: {
+      getDetail(id){
+        getOddjob(this.queryParams.id).then((res) => {
+          var that = this ;
+          that.form = res.data;
+        })
+      },
+      onSubmit(){
+        var that = this;
+        updateOddjob(that.form).then((r1) => {
+          if (r1.code == 200){
+            that.$notify({ type: 'success', message: '修改成功' });
+            setTimeout(function(){
+              history.back(-1);
+            },2000)
+          }
+        })
+      },
+      onConfirmOpenNy(data){
+        this.form.jobTime = this.format(data,'yyyy-MM-dd');
+        this.jobTime = data;
+        this.showBuildTime = false;
+      },
+
+    },
+  }
+</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;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .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: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0PX;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>

src/views/sunVillage_info/list_register_edit.vue

@@ -0,0 +1,241 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      修改零工登记
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn"></div>
+    </div>
+    <van-form @submit="onSubmit">
+      <div class="list_main">
+
+        <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
+            v-model="jobTime"
+            type="year-month"
+            title="选择年月日"
+            @confirm="onConfirmOpenNy"
+            @cancel="showBuildTime = false"
+          />
+        </van-popup>
+
+        <van-field required label="出工姓名" v-model="form.workerName" placeholder="请输入出工姓名" :rules="[{ required: true , message:'请输入出工姓名' }]" input-align="right" :border="false" />
+
+        <van-field required label="出工事由" v-model="form.workReason" placeholder="请输入出工事由" :rules="[{ required: true , message:'请输入出工事由' }]" input-align="right" :border="false" />
+
+        <van-field required label="记工员" v-model="form.workerNote" placeholder="请输入记工员" :rules="[{ required: true , message:'请输入记工员' }]" input-align="right" :border="false" />
+
+        <van-field required label="出工数" v-model="form.workNum" placeholder="请输入出工数" :rules="[{ required: true , message:'请输入出工数' }]" input-align="right" :border="false" />
+
+        <van-field required label="工日值" v-model="form.perMoney" placeholder="请输入工日值" :rules="[{ required: true , message:'请输入工日值' }]" input-align="right" :border="false" />
+
+        <van-field required label="金额(元)" v-model="form.totalMoney" placeholder="请输入金额(元)" :rules="[{ required: true , message:'请输入金额' }]" input-align="right" :border="false" />
+
+        <van-field label="备注" v-model="form.remark" placeholder="请输入备注" input-align="right" :border="false" />
+
+      </div>
+
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          保存
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { addOddjob , getOddjob , updateOddjob } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        showBuildTime:false,
+        form:{
+          jobTime:this.format(new Date(),'yyyy-MM-dd'),
+          workerName:'',
+          workReason:'',
+          workerNote:'',
+          workNum:'',
+          perMoney:'',
+          totalMoney:'',
+          remark:'',
+        },
+        openPic:[],
+        fileList:[],
+        fileList1:[],
+        jobTime:new Date(),
+        type:'',
+        openFile:[],
+        openFileList:[],
+        queryParams:{
+          id:'',
+          bookId:'',
+          deptId:''
+        },
+        openFile2:[],
+        openPic2:[],
+      };
+    },
+    created() {
+      this.type = this.$route.query.type;
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+      this.queryParams.id = this.$route.query.id;
+      this.getDetail();
+    },
+    methods: {
+      getDetail(id){
+        getOddjob(this.queryParams.id).then((res) => {
+          var that = this ;
+          that.form = res.data;
+        })
+      },
+      onSubmit(){
+        var that = this;
+        updateOddjob(that.form).then((r1) => {
+          if (r1.code == 200){
+            that.$notify({ type: 'success', message: '修改成功' });
+            setTimeout(function(){
+              history.back(-1);
+            },2000)
+          }
+        })
+      },
+      onConfirmOpenNy(data){
+        this.form.jobTime = this.format(data,'yyyy-MM-dd');
+        this.jobTime = data;
+        this.showBuildTime = false;
+      },
+
+    },
+  }
+</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;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .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: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0PX;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>

src/views/sunVillage_info/list_tourists.vue

@@ -179,6 +179,7 @@
         this.$dialog.alert({
           title: '提示',
           message: '确认删除？',
+          showCancelButton:true,
         })
           .then(() => {
             tempWorkerOpenRemove(id).then(response => {

src/views/sunVillage_info/list_tourists_add.vue

@@ -43,7 +43,7 @@
           </template>
         </van-field>
 
-        <van-field required readonly input-align="right" :border="false" >
+        <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>
@@ -302,5 +302,8 @@
     /deep/ .van-cell--required::before{
       left: 85PX;
     }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
   }
 </style>

src/views/sunVillage_info/list_tourists_edit.vue

@@ -43,7 +43,7 @@
              </template>
            </van-field>
 
-           <van-field required readonly input-align="right" :border="false" >
+           <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>
@@ -332,5 +332,8 @@
   /deep/ .van-cell--required::before{
     left: 85PX;
   }
+  /deep/ .van-field__error-message{
+    display: none;
+  }
 }
 </style>