From 90d4a8f7184688803aec641a78b83301716a69dd Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 25 Oct 2024 15:03:29 +0800
Subject: [PATCH 1/7] =?UTF-8?q?Task=20=E7=94=A8=E7=AB=A0=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yinnong/seal.js                       |  11 +
 src/router/index.js                           |   9 +
 .../paymentApproval/approvalApproval13.vue    |   4 +-
 .../bankAgriculture/seal/sealApproval.vue     | 246 ++++++++++++++++++
 .../yinnong/doneCompleted/completedNew.vue    |   3 +
 src/views/yinnong/doneCompleted/doneNew.vue   |   3 +
 6 files changed, 273 insertions(+), 3 deletions(-)
 create mode 100644 src/api/yinnong/seal.js
 create mode 100644 src/views/yinnong/bankAgriculture/seal/sealApproval.vue

diff --git a/src/api/yinnong/seal.js b/src/api/yinnong/seal.js
new file mode 100644
index 00000000..756b3bcc
--- /dev/null
+++ b/src/api/yinnong/seal.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询用章申请详细
+export function getSeal(id) {
+  return request({
+    url: '/yinnong/seal/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index c74b5912..a9a465e2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2357,6 +2357,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13'], resolve)
   },
+  {
+    path: '/yinnong/sealApproval',
+    name: 'sealApproval',
+    meta: {
+      title: '用章事项审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/seal/sealApproval'], resolve)
+  },
 
   {
     path: '/yinnong/approvalModify',
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
index 183cd60a..18111186 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13.vue
@@ -271,13 +271,11 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_majorevent",
+          tableName: 't_yinnong_majorevent',
           bizPath: "yinnong",
           fileType: "",
         }
         attachmentList(oData).then(res => {
-          console.log(res)
-          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             // this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
diff --git a/src/views/yinnong/bankAgriculture/seal/sealApproval.vue b/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
new file mode 100644
index 00000000..07874b08
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
+      <template #title>
+        <p style="font-weight: bold;">用章事项审批申请</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+
+    <van-form readonly>
+      <div class="main_box">
+        <van-field :value="form.itemName" label="用印事项" input-align="right" />
+        <van-field :value="form.sealType" label="印章类型" input-align="right" />
+        <van-field :value="form.sealTime" label="申请时间" input-align="right" />
+        <van-field :value="form.useName" label="申请人" input-align="right" />
+        <van-field :value="form.useIdcard" label="身份证号" input-align="right" />
+        <van-field :value="form.usePhone" label="联系电话" input-align="right" />
+        <van-field :value="approvalTemplateName" label="审批流程" input-align="right"/>
+        <van-field :value="form.remark" label="备注" input-align="right" />
+
+        <van-field label="附件" input-align="right" readonly>
+          <template #button>
+            <van-button type="info" size="small" @click="openAttachment(form.id)" >查看附件</van-button>
+          </template>
+        </van-field>
+
+        <van-popup v-model="showAttachment" lock-scroll closeable position="top" :style="{ height: '30%' }" >
+          <div style="padding: 0 13% 0 5%;">
+            <van-divider>附件</van-divider>
+            <van-uploader v-model="fileList" multiple :readonly="true" :show-upload="false" />
+          </div>
+        </van-popup>
+      </div>
+    </van-form>
+
+    <div class="main_box examine_box">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal" :disabled="!isAudit">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field :readonly="!isAudit" v-model="comment" type="textarea" placeholder="请输入审批意见" rows="2" />
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="isAudit">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitApproval" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {selectApprovalByTemplateId, listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import { getCashExpense } from "@/api/onlineHome/bankAgriculture/cashExpense";
+import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
+import request from "@/utils/request";
+import {getSeal} from "@/api/yinnong/seal";
+import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
+import {selectDictLabel} from "@/utils/utils";
+
+export default {
+  name: "sealApproval",
+  data() {
+    return {
+      form: {},
+
+      capitalExpenditureType: null,
+      capitalExpenditureTypeOptions:[],
+      templateList:[],
+
+      // 审核意见默认值
+      pass: "true",
+      comment: "同意",
+
+      showAttachment: false,
+      fileList: [],
+    };
+  },
+  created() {
+    this.reset();
+    listTemplate({ type: '7' }).then(response => {
+      this.templateList = response.rows;
+    });
+    this.getDetail();
+  },
+  watch: {
+    pass: function (val) {
+      if(this.isAudit)
+        this.comment = val === "true" ? "同意" : "驳回";
+    },
+  },
+  methods: {
+    goBack(){
+      this.$router.back(-1);
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        bookId: null,
+        deptId: null,
+        bookName: null,
+        itemName: null,
+        sealTime: null,
+        sealType: null,
+        useName: null,
+        useIdcard: null,
+        usePhone: null,
+        remark: null,
+        auditStatus: null,
+        auditbatchNo: null,
+        approvalTemplateId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+    },
+    getDetail(){
+      getSeal(this.$route.query.id, {translate_dict: 1}).then(response => {
+        this.form = response.data;
+        if(!this.isAudit)
+        {
+          A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {
+            this.pass = resp.data.auditStatus === '3' ? "true" : 'false';
+            this.comment = resp.data.auditRemark;
+          });
+        }
+      });
+    },
+    submitApproval() {
+      approval({
+        taskId: this.$route.query.taskId,
+        auditbatchNo: this.$route.query.auditbatchNo,
+        pass: this.pass,
+        remark: this.comment,
+        deptId: this.form.deptId
+      }).then((response) => {
+        if (response.code === 200) {
+          this.$toast.success("保存成功");
+          setTimeout(function () {
+            history.go(-1)
+          }, 500);
+        } else {
+          this.$toast.success("保存失败");
+        }
+      });
+    },
+    goFlow(){
+      this.$router.push({name: 'approvalProcess13', query: { id: this.$route.query.auditbatchNo, templateId: this.form.approvalTemplateId }});
+    },
+    openAttachment(id) {
+      this.showAttachment = true;
+      this.fileList = [];
+      let params = {
+        tableId: id,
+        tableName: 't_sys_seal',
+        bizPath: "yinnong",
+        fileType: '',
+      };
+      attachmentList(params).then(res => {
+        res.rows.map(r => {
+          let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+          this.fileList.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id});
+        });
+      });
+    },
+  },
+  computed: {
+    isAudit() {
+      return this.$route.query.type != 'done';
+    },
+    approvalTemplateName() {
+      const item = this.templateList.find((x) => x.id == this.form.approvalTemplateId);
+      return item ? item.name : this.form.approvalTemplateId;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 2% 0;
+}
+
+.main_box {
+  width: 96%;
+  margin: 0 auto;
+  border-radius: 6px;
+  box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
+  overflow: hidden;
+  background-color: #FFF;
+}
+
+.submitButton {
+  width: 80%;
+  margin: 0 auto;
+  background-color: #1D6FE9;
+}
+
+.examine_box {
+  background-color: #1D6FE9 !important;
+  padding: 0.18rem !important;
+  padding-left: 0 !important;
+  border-radius: 0.15rem !important;
+  margin-top: 0.3rem !important;
+}
+
+.examine_box .van-col:first-child {
+  color: #FFF !important;
+  font-size: 0.45rem !important;
+  text-align: center !important;
+}
+
+.examine_box .van-col:last-child {
+  background-color: #FFF !important;
+  border-radius: 0.15rem !important;
+  overflow: hidden !important;
+
+  .van-radio-group--horizontal {
+    padding: 0.2rem 0;
+    border-bottom: 1px solid #eee;
+  }
+}
+
+/deep/ .van-radio--horizontal {
+  margin-left: 20px;
+  margin-right: 0;
+}
+
+.submitButton {
+  width: 96%;
+  margin: 0 auto;
+}
+</style>
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 6792a38b..d7e1e2d4 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -243,6 +243,9 @@
                 query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "todo" }
               });
               break;
+            case 't_sys_seal':
+              this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+              break;
           }
         }
       },
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 99e6bab9..4f4caa81 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -224,6 +224,9 @@
                 query: { id: item.data.id, taskId: item.id, auditbatchNo: item.auditbatchNo, type: "done" }
               });
               break;
+            case 't_sys_seal':
+              this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+              break;
           }
         }
       },

From 5222fc1bf6887a89295cd57b8f52fac4969bc35d Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 25 Oct 2024 15:30:52 +0800
Subject: [PATCH 2/7] =?UTF-8?q?Task=20=E8=B5=84=E4=BA=A7=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yinnong/asset.js                      |  11 +
 src/router/index.js                           |  11 +-
 .../bankAgriculture/asset/assetApproval.vue   | 236 ++++++++++++++++++
 .../bankAgriculture/seal/sealApproval.vue     |  14 +-
 .../yinnong/doneCompleted/completedNew.vue    |   3 +
 src/views/yinnong/doneCompleted/doneNew.vue   |   3 +
 6 files changed, 267 insertions(+), 11 deletions(-)
 create mode 100644 src/api/yinnong/asset.js
 create mode 100644 src/views/yinnong/bankAgriculture/asset/assetApproval.vue

diff --git a/src/api/yinnong/asset.js b/src/api/yinnong/asset.js
new file mode 100644
index 00000000..8ff58325
--- /dev/null
+++ b/src/api/yinnong/asset.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询资产处置详细
+export function getAsset(id) {
+  return request({
+    url: '/yinnong/asset/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index a9a465e2..a2d65c0c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2361,11 +2361,20 @@ export const constantRoutes = [
     path: '/yinnong/sealApproval',
     name: 'sealApproval',
     meta: {
-      title: '用章事项审批',
+      title: '用章事项申请审批',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/seal/sealApproval'], resolve)
   },
+  {
+    path: '/yinnong/assetApproval',
+    name: 'assetApproval',
+    meta: {
+      title: '资产处置申请审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/asset/assetApproval'], resolve)
+  },
 
   {
     path: '/yinnong/approvalModify',
diff --git a/src/views/yinnong/bankAgriculture/asset/assetApproval.vue b/src/views/yinnong/bankAgriculture/asset/assetApproval.vue
new file mode 100644
index 00000000..52c43a36
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/asset/assetApproval.vue
@@ -0,0 +1,236 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
+      <template #title>
+        <p style="font-weight: bold;">资产处置申请审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+
+    <van-form readonly>
+      <div class="main_box">
+        <van-field :value="form.assetName" label="资产名称" input-align="right" />
+        <van-field :value="form.applyAt" label="申请日期" input-align="right" />
+        <van-field :value="form.assetType" label="资产类别" input-align="right" />
+        <van-field :value="form.assetStatus" label="处置类型" input-align="right" />
+        <van-field :value="approvalTemplateName" label="审批流程" input-align="right"/>
+        <van-field :value="form.doRemark" label="处置原因" input-align="right" />
+
+        <van-field label="附件" input-align="right" readonly>
+          <template #button>
+            <van-button type="info" size="small" @click="openAttachment(form.id)" >查看附件</van-button>
+          </template>
+        </van-field>
+
+        <van-popup v-model="showAttachment" lock-scroll closeable position="top" :style="{ height: '30%' }" >
+          <div style="padding: 0 13% 0 5%;">
+            <van-divider>附件</van-divider>
+            <van-uploader v-model="fileList" multiple :readonly="true" :show-upload="false" />
+          </div>
+        </van-popup>
+      </div>
+    </van-form>
+
+    <div class="main_box examine_box">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal" :disabled="!isAudit">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field :readonly="!isAudit" v-model="comment" type="textarea" placeholder="请输入审批意见" rows="2" />
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="isAudit">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitApproval" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
+import request from "@/utils/request";
+import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
+import {getAsset} from "@/api/yinnong/asset";
+
+export default {
+  name: "assetApproval",
+  data() {
+    return {
+      form: {},
+      templateList:[],
+      // 审核意见默认值
+      pass: "true",
+      comment: "同意",
+      showAttachment: false,
+      fileList: [],
+      tableName: 't_sys_asset',
+    };
+  },
+  created() {
+    this.reset();
+    listTemplate({ type: '8' }).then(response => {
+      this.templateList = response.rows;
+    });
+    this.getDetail();
+  },
+  watch: {
+    pass: function (val) {
+      if(this.isAudit)
+        this.comment = val === "true" ? "同意" : "驳回";
+    },
+  },
+  methods: {
+    goBack(){
+      this.$router.back(-1);
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        bookId: null,
+        bookName: null,
+        applyAt: null,
+        assetName: null,
+        assetType: null,
+        assetStatus: null,
+        doRemark: null,
+        auditStatus: null,
+        auditbatchNo: null,
+        approvalTemplateId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+    },
+    getDetail(){
+      getAsset(this.$route.query.id, {translate_dict: 1}).then(response => {
+        this.form = response.data;
+        if(!this.isAudit)
+        {
+          A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {
+            this.pass = resp.data.auditStatus === '3' ? "true" : 'false';
+            this.comment = resp.data.auditRemark;
+          });
+        }
+      });
+    },
+    submitApproval() {
+      approval({
+        taskId: this.$route.query.taskId,
+        auditbatchNo: this.$route.query.auditbatchNo,
+        pass: this.pass,
+        remark: this.comment,
+        deptId: this.form.deptId
+      }).then((response) => {
+        if (response.code === 200) {
+          this.$toast.success("保存成功");
+          setTimeout(function () {
+            history.go(-1)
+          }, 500);
+        } else {
+          this.$toast.success("保存失败");
+        }
+      });
+    },
+    goFlow(){
+      this.$router.push({name: 'approvalProcess13', query: { id: this.$route.query.auditbatchNo, templateId: this.form.approvalTemplateId }});
+    },
+    openAttachment(id) {
+      this.showAttachment = true;
+      this.fileList = [];
+      let params = {
+        tableId: id,
+        tableName: this.tableName,
+        bizPath: "yinnong",
+        fileType: '',
+      };
+      attachmentList(params).then(res => {
+        res.rows.map(r => {
+          let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+          this.fileList.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id});
+        });
+      });
+    },
+  },
+  computed: {
+    isAudit() {
+      return this.$route.query.type != 'done';
+    },
+    approvalTemplateName() {
+      const item = this.templateList.find((x) => x.id == this.form.approvalTemplateId);
+      return item ? item.name : this.form.approvalTemplateId;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 2% 0;
+}
+
+.main_box {
+  width: 96%;
+  margin: 0 auto;
+  border-radius: 6px;
+  box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
+  overflow: hidden;
+  background-color: #FFF;
+}
+
+.submitButton {
+  width: 80%;
+  margin: 0 auto;
+  background-color: #1D6FE9;
+}
+
+.examine_box {
+  background-color: #1D6FE9 !important;
+  padding: 0.18rem !important;
+  padding-left: 0 !important;
+  border-radius: 0.15rem !important;
+  margin-top: 0.3rem !important;
+}
+
+.examine_box .van-col:first-child {
+  color: #FFF !important;
+  font-size: 0.45rem !important;
+  text-align: center !important;
+}
+
+.examine_box .van-col:last-child {
+  background-color: #FFF !important;
+  border-radius: 0.15rem !important;
+  overflow: hidden !important;
+
+  .van-radio-group--horizontal {
+    padding: 0.2rem 0;
+    border-bottom: 1px solid #eee;
+  }
+}
+
+/deep/ .van-radio--horizontal {
+  margin-left: 20px;
+  margin-right: 0;
+}
+
+.submitButton {
+  width: 96%;
+  margin: 0 auto;
+}
+</style>
diff --git a/src/views/yinnong/bankAgriculture/seal/sealApproval.vue b/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
index 07874b08..eedc8f5d 100644
--- a/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
+++ b/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
       <template #title>
-        <p style="font-weight: bold;">用章事项审批申请</p>
+        <p style="font-weight: bold;">用章事项申请审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -61,30 +61,24 @@
 
 <script>
 
-import {selectApprovalByTemplateId, listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
-import { getCashExpense } from "@/api/onlineHome/bankAgriculture/cashExpense";
+import {listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
 import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
 import request from "@/utils/request";
 import {getSeal} from "@/api/yinnong/seal";
 import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
-import {selectDictLabel} from "@/utils/utils";
 
 export default {
   name: "sealApproval",
   data() {
     return {
       form: {},
-
-      capitalExpenditureType: null,
-      capitalExpenditureTypeOptions:[],
       templateList:[],
-
       // 审核意见默认值
       pass: "true",
       comment: "同意",
-
       showAttachment: false,
       fileList: [],
+      tableName: 't_sys_seal',
     };
   },
   created() {
@@ -165,7 +159,7 @@ export default {
       this.fileList = [];
       let params = {
         tableId: id,
-        tableName: 't_sys_seal',
+        tableName: this.tableName,
         bizPath: "yinnong",
         fileType: '',
       };
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index d7e1e2d4..f2465a01 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -246,6 +246,9 @@
             case 't_sys_seal':
               this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
               break;
+            case 't_sys_asset':
+              this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+              break;
           }
         }
       },
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 4f4caa81..962e6346 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -227,6 +227,9 @@
             case 't_sys_seal':
               this.$router.push({name:'sealApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
               break;
+            case 't_sys_asset':
+              this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+              break;
           }
         }
       },

From f9cf321c867ca2139daf3f834cbf7378dff5d52e Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 25 Oct 2024 15:35:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?Task=20=E8=B5=84=E4=BA=A7=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yinnong/seal.js                               | 11 -----------
 src/api/yinnong/{asset.js => yinnongApproval.js}      |  9 +++++++++
 src/router/index.js                                   |  4 ++--
 .../{asset => approval}/assetApproval.vue             |  2 +-
 .../{seal => approval}/sealApproval.vue               |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 src/api/yinnong/seal.js
 rename src/api/yinnong/{asset.js => yinnongApproval.js} (55%)
 rename src/views/yinnong/bankAgriculture/{asset => approval}/assetApproval.vue (99%)
 rename src/views/yinnong/bankAgriculture/{seal => approval}/sealApproval.vue (99%)

diff --git a/src/api/yinnong/seal.js b/src/api/yinnong/seal.js
deleted file mode 100644
index 756b3bcc..00000000
--- a/src/api/yinnong/seal.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-
-// 查询用章申请详细
-export function getSeal(id) {
-  return request({
-    url: '/yinnong/seal/get/' + id,
-    method: 'get',
-    params: arguments[1] || {}
-  })
-}
-
diff --git a/src/api/yinnong/asset.js b/src/api/yinnong/yinnongApproval.js
similarity index 55%
rename from src/api/yinnong/asset.js
rename to src/api/yinnong/yinnongApproval.js
index 8ff58325..97e5c77d 100644
--- a/src/api/yinnong/asset.js
+++ b/src/api/yinnong/yinnongApproval.js
@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 查询用章申请详细
+export function getSeal(id) {
+  return request({
+    url: '/yinnong/seal/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
 // 查询资产处置详细
 export function getAsset(id) {
   return request({
diff --git a/src/router/index.js b/src/router/index.js
index a2d65c0c..b9343656 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2364,7 +2364,7 @@ export const constantRoutes = [
       title: '用章事项申请审批',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/yinnong/bankAgriculture/seal/sealApproval'], resolve)
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/approval/sealApproval'], resolve)
   },
   {
     path: '/yinnong/assetApproval',
@@ -2373,7 +2373,7 @@ export const constantRoutes = [
       title: '资产处置申请审批',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/yinnong/bankAgriculture/asset/assetApproval'], resolve)
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/approval/assetApproval'], resolve)
   },
 
   {
diff --git a/src/views/yinnong/bankAgriculture/asset/assetApproval.vue b/src/views/yinnong/bankAgriculture/approval/assetApproval.vue
similarity index 99%
rename from src/views/yinnong/bankAgriculture/asset/assetApproval.vue
rename to src/views/yinnong/bankAgriculture/approval/assetApproval.vue
index 52c43a36..b1a579be 100644
--- a/src/views/yinnong/bankAgriculture/asset/assetApproval.vue
+++ b/src/views/yinnong/bankAgriculture/approval/assetApproval.vue
@@ -63,7 +63,7 @@ import {listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentAp
 import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
 import request from "@/utils/request";
 import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
-import {getAsset} from "@/api/yinnong/asset";
+import {getAsset} from "@/api/yinnong/yinnongApproval";
 
 export default {
   name: "assetApproval",
diff --git a/src/views/yinnong/bankAgriculture/seal/sealApproval.vue b/src/views/yinnong/bankAgriculture/approval/sealApproval.vue
similarity index 99%
rename from src/views/yinnong/bankAgriculture/seal/sealApproval.vue
rename to src/views/yinnong/bankAgriculture/approval/sealApproval.vue
index eedc8f5d..68f00b7a 100644
--- a/src/views/yinnong/bankAgriculture/seal/sealApproval.vue
+++ b/src/views/yinnong/bankAgriculture/approval/sealApproval.vue
@@ -64,7 +64,7 @@
 import {listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
 import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
 import request from "@/utils/request";
-import {getSeal} from "@/api/yinnong/seal";
+import {getSeal} from "@/api/yinnong/yinnongApproval";
 import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
 
 export default {

From 8c186903bf819f5802f1169f69e1f2676c8b7371 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 25 Oct 2024 15:45:09 +0800
Subject: [PATCH 4/7] =?UTF-8?q?Task=20=E5=90=88=E5=90=8C=E7=AD=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yinnong/yinnongApproval.js            |   9 +
 src/router/index.js                           |   9 +
 .../approval/contractionApproval.vue          | 251 ++++++++++++++++++
 .../yinnong/doneCompleted/completedNew.vue    |   3 +
 src/views/yinnong/doneCompleted/doneNew.vue   |   3 +
 5 files changed, 275 insertions(+)
 create mode 100644 src/views/yinnong/bankAgriculture/approval/contractionApproval.vue

diff --git a/src/api/yinnong/yinnongApproval.js b/src/api/yinnong/yinnongApproval.js
index 97e5c77d..025a2738 100644
--- a/src/api/yinnong/yinnongApproval.js
+++ b/src/api/yinnong/yinnongApproval.js
@@ -18,3 +18,12 @@ export function getAsset(id) {
   })
 }
 
+// 查询合同签订详细
+export function getContraction(id) {
+  return request({
+    url: '/yinnong/contraction/get/' + id,
+    method: 'get',
+    params: arguments[1] || {}
+  })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index b9343656..5e1a6591 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2375,6 +2375,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/approval/assetApproval'], resolve)
   },
+  {
+    path: '/yinnong/contractionApproval',
+    name: 'contractionApproval',
+    meta: {
+      title: '合同签订申请审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/approval/contractionApproval'], resolve)
+  },
 
   {
     path: '/yinnong/approvalModify',
diff --git a/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue b/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue
new file mode 100644
index 00000000..43de6a18
--- /dev/null
+++ b/src/views/yinnong/bankAgriculture/approval/contractionApproval.vue
@@ -0,0 +1,251 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar left-arrow fixed placeholder @click-left="goBack">
+      <template #title>
+        <p style="font-weight: bold;">合同签订申请审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+
+    <van-form readonly>
+      <div class="main_box">
+        <van-field :value="form.conName" label="合同名称" input-align="right" />
+        <van-field :value="form.applyAt" label="申请日期" input-align="right" />
+        <van-field :value="form.contractionType" label="合同类型" input-align="right" />
+        <van-field :value="form.paymentType" label="结款类型" input-align="right" />
+        <van-field :value="form.isTender" label="是否招投标" input-align="right" />
+        <van-field :value="form.totalAmount" label="合同金额(元)" input-align="right" type="number" />
+        <van-field :value="form.secondParty" label="对方单位" input-align="right" />
+        <van-field :value="form.secondPartyDirector" label="对方代表" input-align="right" />
+        <van-field :value="form.secondPartyPhone" label="对方代表电话" input-align="right" />
+        <van-field :value="form.startTime" label="开始日期" input-align="right" />
+        <van-field :value="form.endTime" label="结束日期" input-align="right" />
+        <van-field :value="approvalTemplateName" label="审批流程" input-align="right"/>
+        <van-field :value="form.remark" label="备注" input-align="right" />
+
+        <van-field label="附件" input-align="right" readonly>
+          <template #button>
+            <van-button type="info" size="small" @click="openAttachment(form.id)" >查看附件</van-button>
+          </template>
+        </van-field>
+
+        <van-popup v-model="showAttachment" lock-scroll closeable position="top" :style="{ height: '30%' }" >
+          <div style="padding: 0 13% 0 5%;">
+            <van-divider>附件</van-divider>
+            <van-uploader v-model="fileList" multiple :readonly="true" :show-upload="false" />
+          </div>
+        </van-popup>
+      </div>
+    </van-form>
+
+    <div class="main_box examine_box">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal" :disabled="!isAudit">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field :readonly="!isAudit" v-model="comment" type="textarea" placeholder="请输入审批意见" rows="2" />
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="isAudit">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitApproval" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {listTemplate, approval} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import {attachmentList} from "@/api/sunVillage_info/fixedAssets";
+import request from "@/utils/request";
+import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
+import {getContraction} from "@/api/yinnong/yinnongApproval";
+
+export default {
+  name: "contractionApproval",
+  data() {
+    return {
+      form: {},
+      templateList:[],
+      // 审核意见默认值
+      pass: "true",
+      comment: "同意",
+      showAttachment: false,
+      fileList: [],
+      tableName: 't_sys_contraction',
+    };
+  },
+  created() {
+    this.reset();
+    listTemplate({ type: '9' }).then(response => {
+      this.templateList = response.rows;
+    });
+    this.getDetail();
+  },
+  watch: {
+    pass: function (val) {
+      if(this.isAudit)
+        this.comment = val === "true" ? "同意" : "驳回";
+    },
+  },
+  methods: {
+    goBack(){
+      this.$router.back(-1);
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        bookId: null,
+        bookName: null,
+        conName: null,
+        applyAt: null,
+        contractionType: null,
+        paymentType: null,
+        isTender: null,
+        totalAmount: null,
+        secondParty: null,
+        secondPartyDirector: null,
+        secondPartyPhone: null,
+        startTime: null,
+        endTime: null,
+        remark: null,
+        auditStatus: null,
+        auditbatchNo: null,
+        approvalTemplateId: null,
+        isArchive: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+    },
+    getDetail(){
+      getContraction(this.$route.query.id, {translate_dict: 1}).then(response => {
+        this.form = response.data;
+        if(!this.isAudit)
+        {
+          A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {
+            this.pass = resp.data.auditStatus === '3' ? "true" : 'false';
+            this.comment = resp.data.auditRemark;
+          });
+        }
+      });
+    },
+    submitApproval() {
+      approval({
+        taskId: this.$route.query.taskId,
+        auditbatchNo: this.$route.query.auditbatchNo,
+        pass: this.pass,
+        remark: this.comment,
+        deptId: this.form.deptId
+      }).then((response) => {
+        if (response.code === 200) {
+          this.$toast.success("保存成功");
+          setTimeout(function () {
+            history.go(-1)
+          }, 500);
+        } else {
+          this.$toast.success("保存失败");
+        }
+      });
+    },
+    goFlow(){
+      this.$router.push({name: 'approvalProcess13', query: { id: this.$route.query.auditbatchNo, templateId: this.form.approvalTemplateId }});
+    },
+    openAttachment(id) {
+      this.showAttachment = true;
+      this.fileList = [];
+      let params = {
+        tableId: id,
+        tableName: this.tableName,
+        bizPath: "yinnong",
+        fileType: '',
+      };
+      attachmentList(params).then(res => {
+        res.rows.map(r => {
+          let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+          this.fileList.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id});
+        });
+      });
+    },
+  },
+  computed: {
+    isAudit() {
+      return this.$route.query.type != 'done';
+    },
+    approvalTemplateName() {
+      const item = this.templateList.find((x) => x.id == this.form.approvalTemplateId);
+      return item ? item.name : this.form.approvalTemplateId;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  padding: 2% 0;
+}
+
+.main_box {
+  width: 96%;
+  margin: 0 auto;
+  border-radius: 6px;
+  box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
+  overflow: hidden;
+  background-color: #FFF;
+}
+
+.submitButton {
+  width: 80%;
+  margin: 0 auto;
+  background-color: #1D6FE9;
+}
+
+.examine_box {
+  background-color: #1D6FE9 !important;
+  padding: 0.18rem !important;
+  padding-left: 0 !important;
+  border-radius: 0.15rem !important;
+  margin-top: 0.3rem !important;
+}
+
+.examine_box .van-col:first-child {
+  color: #FFF !important;
+  font-size: 0.45rem !important;
+  text-align: center !important;
+}
+
+.examine_box .van-col:last-child {
+  background-color: #FFF !important;
+  border-radius: 0.15rem !important;
+  overflow: hidden !important;
+
+  .van-radio-group--horizontal {
+    padding: 0.2rem 0;
+    border-bottom: 1px solid #eee;
+  }
+}
+
+/deep/ .van-radio--horizontal {
+  margin-left: 20px;
+  margin-right: 0;
+}
+
+.submitButton {
+  width: 96%;
+  margin: 0 auto;
+}
+</style>
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index f2465a01..0b9ac92e 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -249,6 +249,9 @@
             case 't_sys_asset':
               this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
               break;
+            case 't_sys_contraction':
+              this.$router.push({name:'contractionApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
+              break;
           }
         }
       },
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 962e6346..fed8262b 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -230,6 +230,9 @@
             case 't_sys_asset':
               this.$router.push({name:'assetApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
               break;
+            case 't_sys_contraction':
+              this.$router.push({name:'contractionApproval',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
+              break;
           }
         }
       },

From bc82f9629635985aa765ef0a7b4c30133aa38da3 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Thu, 31 Oct 2024 11:05:06 +0800
Subject: [PATCH 5/7] =?UTF-8?q?Bug=20=E9=94=99=E8=AF=AF=E6=97=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E9=99=90=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/PagedList.vue                      | 9 +++++++++
 .../homestead/arbitration/arbitrationHandlerList.vue     | 2 ++
 .../onlineHome/homestead/arbitration/arbitrationList.vue | 2 ++
 .../homestead/arbitration/arbitrationProcessList.vue     | 2 ++
 .../onlineHome/homestead/certificate/certificateList.vue | 2 ++
 .../homestead/homeApplication/applicationList.vue        | 2 ++
 .../onlineHome/homestead/reporting/taskReportingList.vue | 2 ++
 src/views/onlineHome/publicity.vue                       | 2 ++
 .../sunVillage_info/arbitration/arbitrationList.vue      | 2 ++
 .../sunVillage_info/entityReport/reportLineList.vue      | 2 ++
 src/views/sunVillage_info/entityReport/reportList.vue    | 2 ++
 .../sunVillage_info/homeApplication/applicationList.vue  | 2 ++
 .../homeApplication/applicationNewList.vue               | 2 ++
 src/views/sunVillage_info/list_tourists_ranking_lite.vue | 2 ++
 .../homestead/homeApplication/applicationGsList.vue      | 2 ++
 .../homestead/homeApplication/applicationList.vue        | 2 ++
 16 files changed, 39 insertions(+)

diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue
index 9c467bb6..b0b49bfc 100644
--- a/src/components/common/PagedList.vue
+++ b/src/components/common/PagedList.vue
@@ -123,6 +123,8 @@ export default {
         {
           this.setupFinished(true);
         }
+      }).catch((err) => {
+        this.setupError(err);
       }).finally(() => {
         this.setupLoading(false);
         this.setupRefreshing(false);
@@ -157,6 +159,13 @@ export default {
       if(ok)
         this.$emit('finished', this.stateTotal);
     },
+    setupError(err) {
+      this.log(`error -> ${ok}`);
+      this.stateFinished = true;
+      if(this.stateFinished != this.finished)
+        this.$emit('update:finished', this.stateFinished);
+      this.$emit('error', err);
+    },
     setupRefreshing(ok) {
       this.log(`refreshing -> ${ok}`);
       this.stateRefreshing = ok;
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
index 4b481105..4aaaf893 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
@@ -131,6 +131,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
index c9951ddc..e2a2df22 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
@@ -137,6 +137,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
index fa1675f1..e3e6eb18 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
@@ -131,6 +131,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/homestead/certificate/certificateList.vue b/src/views/onlineHome/homestead/certificate/certificateList.vue
index c3130acc..5c19a185 100644
--- a/src/views/onlineHome/homestead/certificate/certificateList.vue
+++ b/src/views/onlineHome/homestead/certificate/certificateList.vue
@@ -142,6 +142,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index a69cb86d..45bab70b 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -146,6 +146,8 @@ export default {
         }
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/homestead/reporting/taskReportingList.vue b/src/views/onlineHome/homestead/reporting/taskReportingList.vue
index aff69961..aa0e3932 100644
--- a/src/views/onlineHome/homestead/reporting/taskReportingList.vue
+++ b/src/views/onlineHome/homestead/reporting/taskReportingList.vue
@@ -133,6 +133,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/onlineHome/publicity.vue b/src/views/onlineHome/publicity.vue
index 11616a42..78e8230b 100644
--- a/src/views/onlineHome/publicity.vue
+++ b/src/views/onlineHome/publicity.vue
@@ -90,6 +90,8 @@ import { getList } from "@/api/onlineHome/homestead/information";
             });
             this.total += response.rows.length;
             this.finished = this.total >= response.total;
+          }).catch(() => {
+            this.finished = true;
           }).finally(() => {
             this.loading = false;
             this.refreshing = false;
diff --git a/src/views/sunVillage_info/arbitration/arbitrationList.vue b/src/views/sunVillage_info/arbitration/arbitrationList.vue
index 30d187d9..8dc7a79c 100644
--- a/src/views/sunVillage_info/arbitration/arbitrationList.vue
+++ b/src/views/sunVillage_info/arbitration/arbitrationList.vue
@@ -180,6 +180,8 @@ export default {
         });
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/sunVillage_info/entityReport/reportLineList.vue b/src/views/sunVillage_info/entityReport/reportLineList.vue
index 1cd582df..bf9d602d 100644
--- a/src/views/sunVillage_info/entityReport/reportLineList.vue
+++ b/src/views/sunVillage_info/entityReport/reportLineList.vue
@@ -113,6 +113,8 @@ export default {
         this.list.push(...response.rows);
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/sunVillage_info/entityReport/reportList.vue b/src/views/sunVillage_info/entityReport/reportList.vue
index 94101080..fa7d3f08 100644
--- a/src/views/sunVillage_info/entityReport/reportList.vue
+++ b/src/views/sunVillage_info/entityReport/reportList.vue
@@ -129,6 +129,8 @@ export default {
         this.list.push(...response.rows);
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue
index b8431ca1..e4c807d4 100644
--- a/src/views/sunVillage_info/homeApplication/applicationList.vue
+++ b/src/views/sunVillage_info/homeApplication/applicationList.vue
@@ -160,6 +160,8 @@ export default {
         }
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/sunVillage_info/homeApplication/applicationNewList.vue b/src/views/sunVillage_info/homeApplication/applicationNewList.vue
index ceb71c36..bb1eb03d 100644
--- a/src/views/sunVillage_info/homeApplication/applicationNewList.vue
+++ b/src/views/sunVillage_info/homeApplication/applicationNewList.vue
@@ -160,6 +160,8 @@ export default {
         }
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;
diff --git a/src/views/sunVillage_info/list_tourists_ranking_lite.vue b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
index 6dbb7a22..e92f5500 100644
--- a/src/views/sunVillage_info/list_tourists_ranking_lite.vue
+++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue
@@ -115,6 +115,8 @@ import {registrationList} from "@/api/sunVillage_info/subcontract";
             }
             this.total += response.rows.length;
             this.finished = this.total >= response.total;
+          }).catch(() => {
+            this.finished = true;
           }).finally(() => {
             this.loading = false;
             this.refreshing = false;
diff --git a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
index 60e0b048..f55ae03e 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue
@@ -143,6 +143,8 @@
           }
           this.total += response.rows.length;
           this.finished = this.total >= response.total;
+        }).catch(() => {
+          this.finished = true;
         }).finally(() => {
           this.loading = false;
           this.refreshing = false;
diff --git a/src/views/yinnong/homestead/homeApplication/applicationList.vue b/src/views/yinnong/homestead/homeApplication/applicationList.vue
index 8bcc46f2..f89883d0 100644
--- a/src/views/yinnong/homestead/homeApplication/applicationList.vue
+++ b/src/views/yinnong/homestead/homeApplication/applicationList.vue
@@ -158,6 +158,8 @@ export default {
         }
         this.total += response.rows.length;
         this.finished = this.total >= response.total;
+      }).catch(() => {
+        this.finished = true;
       }).finally(() => {
         this.loading = false;
         this.refreshing = false;

From b18d331970fa15ca8b5ab2aa8aa99c09d1941acf Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Thu, 31 Oct 2024 11:26:40 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Bug=20=E9=94=99=E8=AF=AF=E6=97=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A0=E9=99=90=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/PagedList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue
index b0b49bfc..fb997fcc 100644
--- a/src/components/common/PagedList.vue
+++ b/src/components/common/PagedList.vue
@@ -160,7 +160,7 @@ export default {
         this.$emit('finished', this.stateTotal);
     },
     setupError(err) {
-      this.log(`error -> ${ok}`);
+      this.log(`error -> ${err}`);
       this.stateFinished = true;
       if(this.stateFinished != this.finished)
         this.$emit('update:finished', this.stateFinished);

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 7/7] =?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 {