From ae2f1460389b7d2e053d5b8f25f77b1a8e1842b3 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Thu, 31 Oct 2024 15:02:34 +0800
Subject: [PATCH] =?UTF-8?q?Task=20=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/registration.js       |  46 +++
 .../sunVillage_info/icon_registration.png     | Bin 0 -> 3168 bytes
 src/components/form/FieldDatePicker.vue       |   4 +-
 src/router/index.js                           |  28 ++
 .../registration/registrationDetail.vue       | 179 +++++++++
 .../registration/registrationEdit.vue         | 244 ++++++++++++
 .../registration/registrationList.vue         | 374 ++++++++++++++++++
 .../yinnong/doneCompleted/completedNew.vue    |   1 -
 8 files changed, 874 insertions(+), 2 deletions(-)
 create mode 100644 src/api/sunVillage_info/registration.js
 create mode 100644 src/assets/images/sunVillage_info/icon_registration.png
 create mode 100644 src/views/sunVillage_info/registration/registrationDetail.vue
 create mode 100644 src/views/sunVillage_info/registration/registrationEdit.vue
 create mode 100644 src/views/sunVillage_info/registration/registrationList.vue

diff --git a/src/api/sunVillage_info/registration.js b/src/api/sunVillage_info/registration.js
new file mode 100644
index 00000000..e0099133
--- /dev/null
+++ b/src/api/sunVillage_info/registration.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询零工事项列表
+export function listRegistration(query) {
+  return request({
+    url: '/subcontract/registration/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询零工事项详细
+export function getRegistration(id) {
+  return request({
+    url: '/subcontract/registration/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
+// 新增零工事项
+export function addRegistration(data) {
+  return request({
+    url: '/subcontract/registration/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改零工事项
+export function updateRegistration(data) {
+  return request({
+    url: '/subcontract/registration/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除零工事项
+export function delRegistration(id) {
+  return request({
+    url: '/subcontract/registration/remove/' + id,
+    method: 'get'
+  })
+}
+
diff --git a/src/assets/images/sunVillage_info/icon_registration.png b/src/assets/images/sunVillage_info/icon_registration.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28fbff059c244048164cb1103bb252d3c0ea549
GIT binary patch
literal 3168
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
Q#Ku2AmF!3=xAu<xH)Xp*ZU6uP

literal 0
HcmV?d00001

diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue
index f1c76d61..ce2bc5eb 100644
--- a/src/components/form/FieldDatePicker.vue
+++ b/src/components/form/FieldDatePicker.vue
@@ -15,6 +15,7 @@
       :required="required"
       :label-width="labelWidth || 'auto'"
       :input-align="inputAlign || 'left'"
+      :size="size || ''"
     >
 <!--      <template #button>
         <van-icon name="notes-o" size="20"/>
@@ -64,7 +65,8 @@ export default {
     'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换
     'clearable', // 点击取消时清空绑定值
     'yearRangeLength', // type === 'year' 时生成的年份数量范围 [YEAR - yearRangeLength, YEAR + yearRangeLength]
-      'minDate', 'maxDate'
+      'minDate', 'maxDate',
+    'size',
   ],
   watch: {
     value: function (newVal, oldVal) {
diff --git a/src/router/index.js b/src/router/index.js
index 5e1a6591..82f4d8c8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3768,6 +3768,34 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve)
   },
+  { ////阳光村务（新）-- 零工事项
+    path: '/sunVillage_info/registrationIndex',
+    name: 'registrationIndex',
+    meta: {
+      title: '零工事项',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/registration/registrationList'], resolve)
+  },
+  { ////阳光村务（新）-- 零工事项详情
+    path: '/sunVillage_info/registrationDetail',
+    name: 'registrationDetail',
+    meta: {
+      title: '零工事项详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/registration/registrationDetail'], resolve)
+  },
+  { ////阳光村务（新）-- 新增/编辑零工事项
+    path: '/sunVillage_info/registrationEdit',
+    name: 'registrationEdit',
+    meta: {
+      title: '编辑零工事项',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/registration/registrationEdit'], resolve)
+  },
+
   { ////阳光村务（新）-- 发包方审核
     path: '/sunVillage_info/list_employer_process',
     name: 'sunVillageInfoListEmployerProcess',
diff --git a/src/views/sunVillage_info/registration/registrationDetail.vue b/src/views/sunVillage_info/registration/registrationDetail.vue
new file mode 100644
index 00000000..94d8ce5a
--- /dev/null
+++ b/src/views/sunVillage_info/registration/registrationDetail.vue
@@ -0,0 +1,179 @@
+ <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 name="jobTime" :value="form.jobTime" label="出工日期" input-align="right" :border="false" />
+           <van-field name="workReason" :value="form.workReason" label="出工事由" input-align="right" :border="false" />
+
+           <van-field
+             name="openPic1"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic1" :value="form.openPic1" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic2"
+                     label="事中公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic2" :value="form.openPic2" multiple :deletable="false" :show-upload="false"/>
+
+             <van-field
+                     name="openPic3"
+                     label="事后公开"
+                     input-align="right"
+                     :border="false"
+             >
+             </van-field>
+             <CommonUpload name="openPic3" :value="form.openPic3" multiple :deletable="false" :show-upload="false"/>
+
+           <van-field name="remake" :value="form.remark" label="备注" input-align="left" :border="false"/>
+
+         </div>
+
+       </van-form>
+     </div>
+ </template>
+ <script>
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+ import {getRegistration} from "@/api/sunVillage_info/registration";
+   export default {
+     name: "registrationDetail",
+     components: {CommonUpload},
+     data() {
+       return {
+         form: {
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workReason: null,
+             remark: null,
+             openPic1: 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;
+         }
+
+         getRegistration(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/registration/registrationEdit.vue b/src/views/sunVillage_info/registration/registrationEdit.vue
new file mode 100644
index 00000000..45264d40
--- /dev/null
+++ b/src/views/sunVillage_info/registration/registrationEdit.vue
@@ -0,0 +1,244 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+           {{title}}零工事项
+             <div class="return_btn" @click="back()"></div>
+         </div>
+
+       <van-form ref="formData" :show-error-message="false" @submit="submit">
+         <div class="list_main">
+
+           <field-date-picker
+             name="jobTime"
+             class="field_no-label"
+             v-model="form.jobTime"
+             placeholder="请选择出工日期"
+             formatter="yyyy-MM-dd"
+             input-align="right"
+             type="date"
+             label="出工日期"
+             :required="true"
+             :rules="rules.jobTime"
+             size="large"
+           />
+           <van-field name="workReason" v-model="form.workReason" label="出工事由" input-align="right" required :rules="rules.workReason" placeholder="请输入出工事由" size="large" :maxlength="255"/>
+
+           <van-field
+             name="openPic1"
+             label="事前公开"
+             input-align="right"
+             :border="false"
+           >
+           </van-field>
+           <CommonUpload name="openPic1" v-model="form.openPic1" 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 name="remark" v-model="form.remark" label="备注" input-align="left" size="large" :maxlength="255" placeholder="请输入备注"/>
+
+         </div>
+
+         <div style="margin: 16px auto;width: 50%;">
+           <van-button round block type="primary" native-type="submit">
+             保存
+           </van-button>
+         </div>
+
+       </van-form>
+     </div>
+ </template>
+ <script>
+   import CommonUpload from "@/components/form/CommonUpload.vue";
+   import {addRegistration, getRegistration, updateRegistration} from "@/api/sunVillage_info/registration";
+   import FieldDatePicker from "@/components/form/FieldDatePicker.vue";
+   import {Toast} from "vant";
+   export default {
+     name: "registrationDetail",
+     components: {FieldDatePicker, CommonUpload},
+     data() {
+       return {
+         form: {
+             id: null,
+             bookId: null,
+             deptId: null,
+             deptName: null,
+             jobNy: null,
+             jobTime: null,
+             workReason: null,
+             remark: null,
+             openPic1: null,
+             openPic2: null,
+             openPic3: null,
+             createBy: null,
+             createTime: null,
+             updateBy: null,
+             updateTime: null
+         },
+         rules: {
+           jobTime: [{message: '请选择出工日期', required: true}],
+           workReason: [{message: '请选择出工日期', required: true}],
+         },
+         id: null,
+         intent: null,
+       };
+     },
+     created() {
+       this.id = this.$route.query.id;
+       this.intent = this.$route.query.intent;
+       if(this.isEdit)
+        this.getDetail();
+     },
+     methods: {
+       getDetail() {
+         if(!this.id)
+         {
+           this.back();
+           return;
+         }
+
+         getRegistration(this.id).then((resp) => {
+           this.form = resp.data;
+         });
+       },
+       back(ti) {
+         if(ti > 0)
+           setTimeout(() => this.$router.back(), ti);
+         else
+          this.$router.back();
+       },
+       submit() {
+         const loading = Toast.loading({
+           message: '保存中...',
+           duration: 0,
+         });
+         if(this.form.id)
+         {
+           updateRegistration(this.form).then((resp) => {
+             this.$notify({ type: 'success', message: '保存成功' });
+             this.back(1500);
+           }).finally(() => {
+             loading.clear();
+           });
+         }
+         else
+         {
+           addRegistration(this.form).then((resp) => {
+             this.$notify({ type: 'success', message: '新增成功' });
+             this.back(1500);
+           }).finally(() => {
+             loading.clear();
+           });
+         }
+       },
+     },
+     computed: {
+       isAdd() {
+         return this.intent === 'add';
+       },
+       isEdit() {
+         return this.intent === 'edit';
+       },
+       title() {
+         return this.intent === 'edit' ? '编辑' : '新增';
+       },
+     },
+   }
+ </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/registration/registrationList.vue b/src/views/sunVillage_info/registration/registrationList.vue
new file mode 100644
index 00000000..5fe398a2
--- /dev/null
+++ b/src/views/sunVillage_info/registration/registrationList.vue
@@ -0,0 +1,374 @@
+<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="back"></div>
+      <div class="add_btn" @click="add"></div>
+    </div>
+
+<!--    <p class="top_head_title">{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份</p>-->
+
+    <div class="list_main">
+
+      <paged-list
+        ref="pagedList"
+        :page-num.sync="queryParams.pageNum"
+        :page-size.sync="queryParams.pageSize"
+        :total.sync="total"
+        :getListFunc="getListReq"
+        @reload="dataList = []"
+        get-when-created
+        :finished.sync="finished"
+        :loading.sync="loading">
+        <div class="item" v-for="(item,index) in dataList" :key="index" @click="viewItem(item.id)" >
+          <div class="info">
+            <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.stop="viewItem(item.id)">
+              <i class="icon "></i>
+            </div>
+            <div class="opera_btn edit" @click.stop="edit(item.id)">
+              <i class="icon "></i>
+            </div>
+            <div class="opera_btn delete" @click.stop="remove(item.id)">
+              <i class="icon"></i>
+            </div>
+          </div>
+        </div>
+      </paged-list>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import {addRegistration, delRegistration, listRegistration} from "@/api/sunVillage_info/registration";
+  import Cookies from "js-cookie";
+import PagedList from "@/components/common/PagedList.vue";
+import {Dialog, Toast} from "vant";
+  export default {
+    name: "registrationList",
+    components: {PagedList},
+    data() {
+      return {
+        refreshing: false,
+        dataList:[],
+        loading: false,
+        finished: false,
+        total: 0,
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          orderByColumn:'jobTime',
+          isAsc:'desc',
+          year:'',
+        },
+        yearMonth:[],
+        deptName:''
+      };
+    },
+    created() {
+    },
+    methods: {
+      getListReq(pageInfo) {
+        return new Promise((resolve, reject) => {
+          listRegistration(this.queryParams).then((response) => {
+            response.rows.forEach((x) => this.dataList.push(x));
+            resolve(response);
+          });
+        });
+      },
+      viewItem(id){
+        this.$router.push({
+          name: 'registrationDetail',
+          query: {
+            id: id,
+            intent: 'view',
+          },
+        }).catch(() => {});
+      },
+      add() {
+        this.$router.push({
+          name: 'registrationEdit',
+          query: {
+            intent: 'add',
+          },
+        }).catch(() => {});
+      },
+      edit(id) {
+        this.$router.push({
+          name: 'registrationEdit',
+          query: {
+            id: id,
+            intent: 'edit',
+          },
+        }).catch(() => {});
+      },
+      remove(id) {
+        Dialog.confirm({
+          title: '警告',
+          message: '确认删除该项?',
+        })
+        .then(() => {
+          const loading = Toast.loading({
+            message: '删除中...',
+            duration: 0,
+          });
+          delRegistration(id).then((resp) => {
+            this.$notify({ type: 'success', message: '删除成功' });
+            this.$refs.pagedList.getList();
+          }).finally(() => {
+            loading.clear();
+          });
+        })
+        .catch(() => {});
+      },
+      back() {
+        this.$router.back();
+      },
+    },
+  }
+</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:15px 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/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 0b9ac92e..d2f643b6 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -66,7 +66,6 @@
     import { getInfo } from "../../../api/login/index";
     import {A_myTodoList} from "../../../api/audit/aauditpipeline";
     import Cookies from "js-cookie";
-    import {registrationList} from "@/api/sunVillage_info/subcontract";
     import PagedList from "@/components/common/PagedList.vue";
 
     export default {