diff --git a/src/api/contracted/cbf.js b/src/api/contracted/cbf.js
index dc3d315b..733afecb 100644
--- a/src/api/contracted/cbf.js
+++ b/src/api/contracted/cbf.js
@@ -46,7 +46,7 @@ export function updateCbf(data) {
 // 删除承包方信息
 export function deleteCbf(id) {
   return request({
-    url: '/service/cbf/mobile/remove/' + id,
+    url: '/service/cbf/delete/' + id,
     method: 'get'
   });
 }
diff --git a/src/assets/images/sunVillage_info/PDF.png b/src/assets/images/sunVillage_info/PDF.png
new file mode 100644
index 00000000..4c04d10c
Binary files /dev/null and b/src/assets/images/sunVillage_info/PDF.png differ
diff --git a/src/assets/images/sunVillage_info/PPT.png b/src/assets/images/sunVillage_info/PPT.png
new file mode 100644
index 00000000..a80d0b67
Binary files /dev/null and b/src/assets/images/sunVillage_info/PPT.png differ
diff --git a/src/assets/images/sunVillage_info/RAR.png b/src/assets/images/sunVillage_info/RAR.png
new file mode 100644
index 00000000..97425b8d
Binary files /dev/null and b/src/assets/images/sunVillage_info/RAR.png differ
diff --git a/src/assets/images/sunVillage_info/index_block_27.png b/src/assets/images/sunVillage_info/index_block_27.png
new file mode 100644
index 00000000..8634f79f
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_27.png differ
diff --git a/src/assets/images/sunVillage_info/index_code_btn_15.png b/src/assets/images/sunVillage_info/index_code_btn_15.png
new file mode 100644
index 00000000..f8cedfc5
Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_15.png differ
diff --git a/src/assets/images/weather/tianqi-baoxue.png b/src/assets/images/weather/tianqi-baoxue.png
new file mode 100644
index 00000000..3eeaa1ce
Binary files /dev/null and b/src/assets/images/weather/tianqi-baoxue.png differ
diff --git a/src/assets/images/weather/tianqi-baoyu.png b/src/assets/images/weather/tianqi-baoyu.png
new file mode 100644
index 00000000..d4d72ea6
Binary files /dev/null and b/src/assets/images/weather/tianqi-baoyu.png differ
diff --git a/src/assets/images/weather/tianqi-daxue.png b/src/assets/images/weather/tianqi-daxue.png
new file mode 100644
index 00000000..fd4fff34
Binary files /dev/null and b/src/assets/images/weather/tianqi-daxue.png differ
diff --git a/src/assets/images/weather/tianqi-dayu.png b/src/assets/images/weather/tianqi-dayu.png
new file mode 100644
index 00000000..1d19905d
Binary files /dev/null and b/src/assets/images/weather/tianqi-dayu.png differ
diff --git a/src/assets/images/weather/tianqi-duoyun.png b/src/assets/images/weather/tianqi-duoyun.png
new file mode 100644
index 00000000..99b9a055
Binary files /dev/null and b/src/assets/images/weather/tianqi-duoyun.png differ
diff --git a/src/assets/images/weather/tianqi-feng.png b/src/assets/images/weather/tianqi-feng.png
new file mode 100644
index 00000000..d2617f11
Binary files /dev/null and b/src/assets/images/weather/tianqi-feng.png differ
diff --git a/src/assets/images/weather/tianqi-fuchen.png b/src/assets/images/weather/tianqi-fuchen.png
new file mode 100644
index 00000000..9cb57c24
Binary files /dev/null and b/src/assets/images/weather/tianqi-fuchen.png differ
diff --git a/src/assets/images/weather/tianqi-leizhenyu.png b/src/assets/images/weather/tianqi-leizhenyu.png
new file mode 100644
index 00000000..d1418ce4
Binary files /dev/null and b/src/assets/images/weather/tianqi-leizhenyu.png differ
diff --git a/src/assets/images/weather/tianqi-qing.png b/src/assets/images/weather/tianqi-qing.png
new file mode 100644
index 00000000..412eee10
Binary files /dev/null and b/src/assets/images/weather/tianqi-qing.png differ
diff --git a/src/assets/images/weather/tianqi-shachenbao.png b/src/assets/images/weather/tianqi-shachenbao.png
new file mode 100644
index 00000000..d6c3138b
Binary files /dev/null and b/src/assets/images/weather/tianqi-shachenbao.png differ
diff --git a/src/assets/images/weather/tianqi-wu.png b/src/assets/images/weather/tianqi-wu.png
new file mode 100644
index 00000000..50ca4b49
Binary files /dev/null and b/src/assets/images/weather/tianqi-wu.png differ
diff --git a/src/assets/images/weather/tianqi-wumai.png b/src/assets/images/weather/tianqi-wumai.png
new file mode 100644
index 00000000..168eab7c
Binary files /dev/null and b/src/assets/images/weather/tianqi-wumai.png differ
diff --git a/src/assets/images/weather/tianqi-xiaoxue.png b/src/assets/images/weather/tianqi-xiaoxue.png
new file mode 100644
index 00000000..fbb2afb9
Binary files /dev/null and b/src/assets/images/weather/tianqi-xiaoxue.png differ
diff --git a/src/assets/images/weather/tianqi-xiaoyu.png b/src/assets/images/weather/tianqi-xiaoyu.png
new file mode 100644
index 00000000..2c1c4057
Binary files /dev/null and b/src/assets/images/weather/tianqi-xiaoyu.png differ
diff --git a/src/assets/images/weather/tianqi-yangsha.png b/src/assets/images/weather/tianqi-yangsha.png
new file mode 100644
index 00000000..80735e87
Binary files /dev/null and b/src/assets/images/weather/tianqi-yangsha.png differ
diff --git a/src/assets/images/weather/tianqi-yin.png b/src/assets/images/weather/tianqi-yin.png
new file mode 100644
index 00000000..292fc449
Binary files /dev/null and b/src/assets/images/weather/tianqi-yin.png differ
diff --git a/src/assets/images/weather/tianqi-zhenxue.png b/src/assets/images/weather/tianqi-zhenxue.png
new file mode 100644
index 00000000..7ebc69a1
Binary files /dev/null and b/src/assets/images/weather/tianqi-zhenxue.png differ
diff --git a/src/assets/images/weather/tianqi-zhenyu.png b/src/assets/images/weather/tianqi-zhenyu.png
new file mode 100644
index 00000000..97119c14
Binary files /dev/null and b/src/assets/images/weather/tianqi-zhenyu.png differ
diff --git a/src/assets/images/weather/tianqi-zhongxue.png b/src/assets/images/weather/tianqi-zhongxue.png
new file mode 100644
index 00000000..a3374343
Binary files /dev/null and b/src/assets/images/weather/tianqi-zhongxue.png differ
diff --git a/src/assets/images/weather/tianqi-zhongyu.png b/src/assets/images/weather/tianqi-zhongyu.png
new file mode 100644
index 00000000..3487d7f7
Binary files /dev/null and b/src/assets/images/weather/tianqi-zhongyu.png differ
diff --git a/src/permission.js b/src/permission.js
index 6e4e9002..d9f9a37a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -199,6 +199,11 @@ const whiteList = [
   '/pest/pestLogin',//登录
   '/pest/index',//首页
   '/pest/agriculturalRecords',//农事记录
+  '/pest/agriculturalRecordsAdd',//农事记录（新增）
+  '/pest/soilTesting',//土壤检测
+  '/pest/weather',//气象服务
+  '/pest/growthMonitoring',//长势监测
+  '/pest/temperatureAndHumidity',//温湿度
 
 ]
 
diff --git a/src/router/index.js b/src/router/index.js
index a789898e..be091e2c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2005,15 +2005,6 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/personalPicture'], resolve)
   },
-  {
-    path: '/yinnong/done',
-    name: 'yinnongDone',
-    meta: {
-      title: '我的已办',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/yinnong/done'], resolve)
-  },
   {
     path: '/yinnong/doneCompleted/doneNew',
     name: 'yinnongDoneCompletedDoneNew',
@@ -2023,15 +2014,6 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/doneCompleted/doneNew'], resolve)
   },
-  {
-    path: '/yinnong/doneCompleted/completed',
-    name: 'yinnongDoneCompletedCompleted',
-    meta: {
-      title: '我的待办',
-      hidden: true,
-    },
-    component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve)
-  },
   {
     path: '/yinnong/doneCompleted/completedNew',
     name: 'yinnongDoneCompletedCompletedNew',
@@ -5980,7 +5962,61 @@ export const constantRoutes = [
       title: '农事记录',
       hidden: true,
     },
-    component: (resolve) => require(['@/views/pest/agriculturalRecords'], resolve)
+    component: (resolve) => require(['@/views/pest/agriculturalRecords/agriculturalRecords'], resolve)
+  },
+  {
+    path: '/pest/agriculturalRecordsAdd',
+    name: 'agriculturalRecordsAdd',
+    meta: {
+      title: '新增农事记录',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/agriculturalRecords/agriculturalRecordsAdd'], resolve)
+  },
+  {
+    path: '/pest/insectMonitoring',
+    name: 'insectMonitoring',
+    meta: {
+      title: '虫情监测',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/insectMonitoring/insectMonitoring'], resolve)
+  },
+  {
+    path: '/pest/soilTesting',
+    name: 'soilTesting',
+    meta: {
+      title: '土壤检测',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/soilTesting/soilTesting'], resolve)
+  },
+  {
+    path: '/pest/weather',
+    name: 'weather',
+    meta: {
+      title: '气象服务',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/weather/weather'], resolve)
+  },
+  {
+    path: '/pest/growthMonitoring',
+    name: 'growthMonitoring',
+    meta: {
+      title: '长势监测',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/growthMonitoring/growthMonitoring'], resolve)
+  },
+  {
+    path: '/pest/temperatureAndHumidity',
+    name: 'temperatureAndHumidity',
+    meta: {
+      title: '温湿度',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/pest/temperatureAndHumidity/temperatureAndHumidity'], resolve)
   },
 ];
 
diff --git a/src/utils/global.js b/src/utils/global.js
index e93ad963..7ec1613b 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -1,10 +1,8 @@
 const deptId = 100 ;
-const severApi = 'http://192.168.31.107:8080';
 
 export default
 {
   deptId,//区县ID
-  severApi,//全局API
 }
 export const REGION = {
   YI_LONG_XIAN: '仪陇',
diff --git a/src/utils/request.js b/src/utils/request.js
index 46d67c65..023805bc 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -65,10 +65,11 @@ if(responseInterceptor === undefined){
   responseInterceptor = service.interceptors.response.use(res => {
       Toast.clear();
       // 未设置状态码则默认成功状态
-      const code = res.data.code || 200;
+      const code = res.data.code || 200 || '200';
       // 获取错误信息
       const msg = errorCode[code] || res.data.msg || errorCode['default']
       // console.info(gqnum); && gqnum === 0
+      console.log(code)
       if (code === 401) {
         // gqnum++;
         Dialog.confirm({
@@ -135,7 +136,7 @@ if(responseInterceptor === undefined){
       } else if (code === 500) {
         Dialog.alert({ type: 'warning', message: msg });
         return Promise.reject(new Error(msg))
-      } else if (code !== 200 && code !== 401) {
+      } else if (code !== 200 && code !== 401 && code !== '200') {
         Dialog.alert({ type: 'warning', message: msg });
         return Promise.reject('error')
       } else {
diff --git a/src/views/contracted/village/contractor/contractWord.vue b/src/views/contracted/village/contractor/contractWord.vue
index cd5f5639..58ff4d14 100644
--- a/src/views/contracted/village/contractor/contractWord.vue
+++ b/src/views/contracted/village/contractor/contractWord.vue
@@ -25,7 +25,9 @@
           </template>
         </van-field>
         <van-field v-model="form.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="left" maxlength="19" />
-        <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="14" />
+        <van-field v-model="form.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" maxlength="14" />
+        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" maxlength="18" />
+        <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
         <van-field
           v-model="cbflxText"
           label="承包方类型："
@@ -48,8 +50,6 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" maxlength="18" />
-        <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
         <van-field
           v-model="cbfsText"
           label="承包方式："
@@ -149,8 +149,9 @@
             @cancel="showCbqxz = false"
           />
         </van-popup>
-        <van-field v-model="form.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
-        <van-field v-model="form.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field v-model="form.cbdkzs" label="承包地块总数：" placeholder="请输入承包地块总数" required :rules="[{ required: true }]" :border="false" input-align="left" type="digit" />
+        <van-field v-model="form.htzmjm" label="合同总面积(亩)：" placeholder="请输入合同总面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field v-model="form.yhtzmjm" label="原合同总面积(亩)：" placeholder="请输入原合同总面积(亩)" :border="false" input-align="left" type="number" />
       </van-form>
       <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
@@ -248,6 +249,16 @@
         });
       },
       submitForm() {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能保存承包合同信息';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
         this.$refs.formData.validate().then(() => {
           if (this.form.id) {
             updateCbht(this.form).then(response => {
@@ -293,6 +304,7 @@
           cbqxz: null,
           cbdkzs: null,
           htzmjm: null,
+          yhtzmjm: null,
         };
         this.cbfsText = '家庭承包';
         this.cbflxText = '农户';
@@ -359,7 +371,7 @@
   }
 
   /deep/ .van-field__label {
-    width: 225px;
+    width: 245px;
   }
 
   /deep/ .van-field--disabled .van-field__label {
diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue
index 3ca43788..8c9ef13d 100644
--- a/src/views/contracted/village/contractor/contractor.vue
+++ b/src/views/contracted/village/contractor/contractor.vue
@@ -186,7 +186,7 @@
       },
       deleteContractor(id, index) {
         this.$dialog.confirm({
-          message: '是否确认删除此条承包方信息？',
+          message: '是否确认删除此条承包方信息以及与其相关联的家庭成员、承包合同、承包地块？',
         }).then(() => {
             // on confirm
             deleteCbf(id).then(res => {
diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 83b3c5b6..96f6063e 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -70,7 +70,82 @@
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <van-field v-model="form.cbfcysl" label="成员数量：" placeholder="请输入成员数量" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field name="radio" label="是否有住房" :border="false" input-align="left">
+          <template #input>
+            <van-radio-group v-model="form.sfyzf" direction="horizontal">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field name="radio" label="是否在村居住" :border="false" input-align="left">
+          <template #input>
+            <van-radio-group v-model="form.sfzcjz" direction="horizontal">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field
+          v-model="form.householdStatusText"
+          label="整户状态："
+          placeholder="请选择整户状态"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showZhzt = true"
+        />
+        <van-popup v-model="showZhzt" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="householdStatusOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmHouseholdStatusOptions"
+            @cancel="showZhzt = false"
+          />
+        </van-popup>
+        <van-field v-model="form.totalArea" label="总面积(亩)：" placeholder="请输入总面积(亩)" :border="false" input-align="left"  type="number"/>
+        <van-field v-model="form.qqArea" label="确权面积(亩)：" placeholder="请输入确权面积(亩)" :border="false" input-align="left"  type="number"/>
+        <van-field v-model="form.qtArea" label="其他面积(亩)：" placeholder="请输入其他面积(亩)" :border="false" input-align="left" type="number"/>
+        <van-field v-model="form.dks" label="地块数(块)：" placeholder="请输入地块数(块)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.zzjyArea" label="自主经营面积(亩)：" placeholder="请输入自主经营面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.lzcArea" label="流转出面积(亩)：" placeholder="请输入流转出面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.shArea" label="损毁面积(亩)：" placeholder="请输入损毁面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.zzArea" label="征占面积(亩)：" placeholder="请输入征占面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.cbfdcy" label="调查员：" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
+        <van-field v-model="form.cbfdcrq" label="调查日期：" placeholder="请选择调查日期" required :rules="[{ required: true }]"
+                   :border="false" input-align="left" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
+        <van-popup v-model="showDcrq" position="bottom">
+          <van-datetime-picker
+            :value="form.cbfdcrq ? new Date(form.cbfdcrq) : new Date()"
+            type="date"
+            title="请选择调查日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmDcrq"
+            @cancel="showDcrq = false"
+          />
+        </van-popup>
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
+        <van-field v-model="form.gsjsr" label="公示记事人：" placeholder="请输入公示记事人" :border="false" input-align="left" maxlength="50" />
+        <van-field v-model="form.gsjs" label="公示记事：" type="textarea" rows="3" placeholder="请输入公示记事" :border="false" input-align="left" maxlength="250" />
+        <van-field v-model="form.gsshr" label="公示审核人：" placeholder="请输入公示审核人" :border="false" input-align="left" maxlength="20" />
+        <van-field v-model="form.gsshrq" label="公示审核日期：" placeholder="请选择公示审核日期" :border="false" input-align="left" right-icon="arrow-down"
+                   readonly clickable @click="showGsshrq = true" />
+        <van-popup v-model="showGsshrq" position="bottom">
+          <van-datetime-picker
+            :value="form.gsshrq ? new Date(form.gsshrq) : new Date()"
+            type="date"
+            title="请选择公示审核日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmGsshrq"
+            @cancel="showGsshrq = false"
+          />
+        </van-popup>
       </van-form>
       <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
     </div>
@@ -81,17 +156,21 @@
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
+  import FieldRadio from "@/components/form/FieldRadio";
   import { getCbf, updateCbf } from "@/api/contracted/cbf";
 
   export default {
     name: "contractedVillageContractor",
     components: {
-      contractorHeader
+      contractorHeader,FieldRadio
     },
     data() {
       return {
         showType:false,
         showZjType:false,
+        showZhzt:false,
+        showDcrq: false,
+        showGsshrq: false,
         // 承包方信息表单
         form: {},
         // 承包方类型字典
@@ -100,6 +179,10 @@
         credentialTypeOptions: [],
         // 调查任务的完成状态：1表示已完成，2表示未完成
         taskStatus: null,
+        // 整户状态类型字典
+        householdStatusOptions: [],
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
@@ -110,6 +193,9 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+      this.getDicts("household_status").then(response => {
+        this.householdStatusOptions = response.data;
+      });
     },
     mounted() {
       setTimeout(() => {
@@ -122,6 +208,9 @@
           this.form = response.data;
           this.$set(this.form, 'cbflxText', this.selectDictLabel(this.contractorTypeOptions, response.data.cbflx));
           this.$set(this.form, 'cbfzjlxText', this.selectDictLabel(this.credentialTypeOptions, response.data.cbfzjlx));
+          this.$set(this.form, 'householdStatusText', this.selectDictLabel(this.householdStatusOptions, response.data.householdStatus));
+          Cookies.set('householdStatus', this.form.householdStatus, { expires: 30 });
+          Cookies.set('householdStatusText', this.form.householdStatusText, { expires: 30 });
         });
       },
       onConfirmTypeOptions(value){
@@ -134,6 +223,19 @@
         this.form.cbfzjlxText = value.dictLabel;
         this.showZjType = false;
       },
+      onConfirmHouseholdStatusOptions(value){
+        this.form.householdStatus = value.dictValue;
+        this.form.householdStatusText = value.dictLabel;
+        this.showZhzt = false;
+      },
+      onConfirmDcrq(data) {
+        this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
+        this.showDcrq = false;
+      },
+      onConfirmGsshrq(data) {
+        this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
+        this.showGsshrq = false;
+      },
       submitForm() {
         this.$refs.formData.validate().then(() => {
           updateCbf(this.form).then(response => {
@@ -178,7 +280,16 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .van-field__label {
+    -webkit-box-flex: 0;
+    flex: none;
+    box-sizing: border-box;
+    width: 9em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index edaaf8da..97ace82a 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -11,7 +11,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cbfbm" label="代码：" placeholder="<自动生成>" :border="false" input-align="left" maxlength="18">
+        <van-field v-model="form.cbfbm" label="代码：" placeholder="<自动生成>" :border="false" input-align="left" :disabled="true" maxlength="18">
           <!-- <template #button>
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template> -->
@@ -66,7 +66,82 @@
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <van-field v-model="form.cbfcysl" label="成员数量：" placeholder="请输入成员数量" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
+        <van-field name="radio" label="是否有住房" :border="false" input-align="left">
+          <template #input>
+            <van-radio-group v-model="form.sfyzf" direction="horizontal">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field name="radio" label="是否在村居住" :border="false" input-align="left">
+          <template #input>
+            <van-radio-group v-model="form.sfzcjz" direction="horizontal">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+        <van-field
+          v-model="householdStatusText"
+          label="整户状态："
+          placeholder="请选择整户状态"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showZhzt = true"
+        />
+        <van-popup v-model="showZhzt" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="householdStatusOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmHouseholdStatusOptions"
+            @cancel="showZhzt = false"
+          />
+        </van-popup>
+        <van-field v-model="form.totalArea" label="总面积(亩)：" placeholder="请输入总面积(亩)" :border="false" input-align="left"  type="number"/>
+        <van-field v-model="form.qqArea" label="确权面积(亩)：" placeholder="请输入确权面积(亩)" :border="false" input-align="left"  type="number"/>
+        <van-field v-model="form.qtArea" label="其他面积(亩)：" placeholder="请输入其他面积(亩)" :border="false" input-align="left" type="number"/>
+        <van-field v-model="form.dks" label="地块数(块)：" placeholder="请输入地块数(块)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.zzjyArea" label="自主经营面积(亩)：" placeholder="请输入自主经营面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.lzcArea" label="流转出面积(亩)：" placeholder="请输入流转出面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.shArea" label="损毁面积(亩)：" placeholder="请输入损毁面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.zzArea" label="征占面积(亩)：" placeholder="请输入征占面积(亩)" :border="false" input-align="left"   type="number"/>
+        <van-field v-model="form.cbfdcy" label="调查员：" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
+        <van-field v-model="form.cbfdcrq" label="调查日期：" placeholder="请选择调查日期" required :rules="[{ required: true }]"
+                   :border="false" input-align="left" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
+        <van-popup v-model="showDcrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date()"
+            type="date"
+            title="请选择调查日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmDcrq"
+            @cancel="showDcrq = false"
+          />
+        </van-popup>
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
+        <van-field v-model="form.gsjsr" label="公示记事人：" placeholder="请输入公示记事人" :border="false" input-align="left" maxlength="50" />
+        <van-field v-model="form.gsjs" label="公示记事：" type="textarea" rows="3" placeholder="请输入公示记事" :border="false" input-align="left" maxlength="250" />
+        <van-field v-model="form.gsshr" label="公示审核人：" placeholder="请输入公示审核人" :border="false" input-align="left" maxlength="20" />
+        <van-field v-model="form.gsshrq" label="公示审核日期：" placeholder="请选择公示审核日期" :border="false" input-align="left" right-icon="arrow-down"
+                   readonly clickable @click="showGsshrq = true" />
+        <van-popup v-model="showGsshrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date()"
+            type="date"
+            title="请选择公示审核日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmGsshrq"
+            @cancel="showGsshrq = false"
+          />
+        </van-popup>
       </van-form>
       <p class="btn" @click="submitForm">保存</p>
     </div>
@@ -77,13 +152,21 @@
 <script>
   import Cookies from "js-cookie";
   import { addCbf, generateContractorCode } from "@/api/contracted/cbf";
+  import FieldRadio from "@/components/form/FieldRadio";
+  import FieldSelect from "@/components/form/FieldSelect";
 
   export default {
     name: "contractedVillageContractorAdd",
+    components: {
+      FieldRadio,FieldSelect
+    },
     data() {
       return {
         showType:false,
         showZjType:false,
+        showZhzt:false,
+        showDcrq: false,
+        showGsshrq: false,
         // 承包方信息表单
         form: {
           deptId: null,
@@ -96,16 +179,38 @@
           yzbm: null,
           lxdh: null,
           cbfcysl: null,
+          cbfdcy: null,
+          cbfdcrq: null,
           cbfdcjs: null,
+          gsjsr: null,
+          gsjs: null,
+          gsshr: null,
+          gsshrq: null,
+          sfyzf: 'Y',
+          sfzcjz: 'Y',
+          householdStatus: '1',
+          totalArea: null,
+          qqArea: null,
+          qtArea: null,
+          dks: null,
+          zzjyArea: null,
+          lzcArea: null,
+          shArea: null,
+          zzArea: null,
         },
         // 承包方类型(标签名)
         cbflxText: '农户',
         // 承包方证件类型(标签名)
         cbfzjlxText: '居民身份证',
+        householdStatusText: "正常",
         // 承包方类型字典
         contractorTypeOptions: [],
         // 承包方证件类型字典
         credentialTypeOptions: [],
+        // 整户状态类型字典
+        householdStatusOptions: [],
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
@@ -115,6 +220,9 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+      this.getDicts("household_status").then(response => {
+        this.householdStatusOptions = response.data;
+      });
     },
     methods: {
       onConfirmTypeOptions(value){
@@ -127,10 +235,23 @@
         this.cbfzjlxText = value.dictLabel;
         this.showZjType = false;
       },
+      onConfirmHouseholdStatusOptions(value){
+        this.form.householdStatus = value.dictValue;
+        this.householdStatusText = value.dictLabel;
+        this.showZhzt = false;
+      },
+      onConfirmDcrq(data) {
+        this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
+        this.showDcrq = false;
+      },
+      onConfirmGsshrq(data) {
+        this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
+        this.showGsshrq = false;
+      },
       submitForm() {
         this.$refs.formData.validate().then(() => {
           this.form.deptId = this.$route.params.deptId;
-          this.form.cbfcysl = 1;
+          // this.form.cbfcysl = 1;
           addCbf(this.form).then(response => {
             if (response.code == 200) {
               this.$toast({
@@ -164,7 +285,16 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .van-field__label {
+    -webkit-box-flex: 0;
+    flex: none;
+    box-sizing: border-box;
+    width: 9em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }
diff --git a/src/views/contracted/village/contractor/contractorFamily.vue b/src/views/contracted/village/contractor/contractorFamily.vue
index e2e5d7c5..7b90644a 100644
--- a/src/views/contracted/village/contractor/contractorFamily.vue
+++ b/src/views/contracted/village/contractor/contractorFamily.vue
@@ -59,8 +59,8 @@
           </div>
         </template>
       </van-swipe-cell>
-      <!-- getDetail不加(), 第一个参数默认传递的是event，getDetail加(), 需要手动传递$event -->
-      <p class="btn" @click="goDetail()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">新增</p>
+      <!-- addMember不加(), 第一个参数默认传递的是event，addMember加(), 需要手动传递$event -->
+      <p class="btn" @click="addMember()" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">新增</p>
     </div>
     <van-popup v-model="showContractorPopup" position="bottom">
       <van-search v-model="searchKeyword"  placeholder="请输入姓名搜索" />
@@ -120,7 +120,7 @@
         });
       },
       getContractorList() {
-        listCbf({deptId: this.$route.params.deptId}).then(response => {
+        listCbf({deptId: this.$route.params.deptId, householdStatus: '1'}).then(response => {
           this.contractorList = response.rows;
         });
       },
@@ -135,6 +135,28 @@
           }
         });
       },
+      addMember() {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能新增家庭成员信息';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
+        this.$router.push({
+          name: 'contractedVillageContractorFamilyDetail',
+          params: {
+            id: undefined,
+            deptId: this.$route.params.deptId,
+            cbfbm: this.$route.params.cbfbm,
+            cbfmc: this.$route.params.cbfmc,
+            surveyStatus: this.$route.params.surveyStatus
+          }
+        });
+      },
       goDetail(id) {
         this.$router.push({
           name: 'contractedVillageContractorFamilyDetail',
@@ -148,6 +170,16 @@
         });
       },
       deleteFamilyMember(id, index) {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能删除家庭成员信息';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
         this.$dialog.confirm({
           message: '是否确认删除此条家庭成员信息？',
         }).then(() => {
@@ -163,6 +195,16 @@
         });
       },
       householdDivision(item, index) {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能执行分户操作';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
         if (item.yhzgx === '户主') {
           this.$toast.fail('该成员身份为户主，不能分户');
           return false;
@@ -188,6 +230,16 @@
         });
       },
       householdTransfer(item) {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能执行移户操作';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
         if (item.yhzgx === '户主') {
           this.$toast.fail('该成员身份为户主，不能移户');
           return false;
@@ -220,6 +272,16 @@
         });
       },
       houseHolder(item) {
+        let householdStatus = Cookies.get('householdStatus');
+        if (householdStatus !== '1') {
+          let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能执行设为户主操作';
+          this.$toast({
+            icon: 'fail', // 找到自己需要的图标
+            message: msg,
+            duration:"2000"
+          });
+          return;
+        }
         if (item.yhzgx === '户主') {
           this.$toast.fail('该成员身份为户主，无需设置');
           return false;
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index ebb0478d..dfe1cb91 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -27,6 +27,29 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          v-model="cyzjlxText"
+          label="证件类型："
+          placeholder="请选择证件类型"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showCredentialType = true"
+        />
+        <van-popup v-model="showCredentialType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="cyzjlxOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmCredentialTypeOptions"
+            @cancel="showCredentialType = false"
+          />
+        </van-popup>
+        <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
         <van-field
           v-model="familyStatusText"
           label="与户主关系："
@@ -56,29 +79,74 @@
             </van-radio-group>
           </template>
         </van-field>
-        <van-field
-          v-model="cyzjlxText"
-          label="证件类型："
-          placeholder="请选择证件类型"
-          required
-          :rules="[{ required: true }]"
-          :border="false"
-          input-align="right"
-          right-icon="arrow-down"
-          readonly
-          clickable
-          @click="showCredentialType = true"
+        <field-select
+          v-if="form.sfgyr === '2'"
+          v-model="form.wdyy"
+          label="无地原因："
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择无地原因"
+          remote-url="/open/zdzh/list/wdyy_type"
+          :on-remote-response="'data'"
         />
-        <van-popup v-model="showCredentialType" position="bottom">
-          <van-picker
-            show-toolbar
-            :columns="cyzjlxOptions"
-            value-key="dictLabel"
-            @confirm="onConfirmCredentialTypeOptions"
-            @cancel="showCredentialType = false"
+        <FieldRadio
+          v-if="form.sfgyr === '2'"
+          v-model="form.sfhdr"
+          label="是否侯地人员："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfjtjjzzcy"
+          label="是否集体经济组织成员："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.isNew"
+          label="是否新数据："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
+<!--        <field-date-picker-->
+<!--          v-model="form.newAt"-->
+<!--          label="新增时间"-->
+<!--          placeholder="请选择新增时间"-->
+<!--          formatter="yyyy-MM-dd"-->
+<!--          input-align="right"-->
+<!--        />-->
+
+        <van-field v-model="form.newAt" label="新增时间：" placeholder="请选择新增时间" :border="false"
+                   input-align="right" right-icon="arrow-down" readonly clickable @click="showNewAt = true" />
+        <van-popup v-model="showNewAt" position="bottom">
+          <van-datetime-picker
+            :value="form.newAt ? new Date(form.newAt) : new Date()"
+            type="date"
+            title="请选择新增时间"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmNewAt"
+            @cancel="showNewAt = false"
           />
         </van-popup>
-        <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
+
+        <van-field v-model="form.elcbshjd" class="elcbshjd_css" label="二轮承包时户籍地：" placeholder="请输入二轮承包时户籍地" :border="false" input-align="right" maxlength="100" />
+        <van-field v-model="form.xhjd" label="现户籍地：" placeholder="请输入现户籍地" :border="false" input-align="right" maxlength="100" />
+        <!-- <field-select
+          v-model="form.householdStatus"
+          label="整户状态："
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="请选择整户状态"
+          remote-url="/open/zdzh/list/household_status"
+          :on-remote-response="'data'"
+        /> -->
         <van-field
           v-model="cybzText"
           label="成员备注："
@@ -111,10 +179,16 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import FieldRadio from "@/components/form/FieldRadio";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import FieldDatePicker from "@/components/form/FieldDatePicker";
   import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy";
 
   export default {
     name: "contractedVillageContractor",
+    components: {
+      FieldRadio, FieldSelect, FieldDatePicker
+    },
     data() {
       return {
         titleName: '',                  // 顶部标题名
@@ -131,6 +205,9 @@
         familyStatusText: null,         // 家庭身份标签名
         showFamilyStatus: false,        // 控制家庭身份字典弹出层的显示和隐藏
         taskStatus: null,               // 调查任务的完成状态：1表示已完成，2表示未完成
+        showNewAt: false,               // 控制新建日期弹出层的显示和隐藏
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
@@ -186,6 +263,10 @@
         this.cybzText = value.dictLabel;
         this.showMemberRemark = false;
       },
+      onConfirmNewAt(data) {
+        this.form.newAt = this.format(data, 'yyyy-MM-dd');
+        this.showNewAt = false;
+      },
       goBack() {
         this.$router.push({
           name: 'contractedVillageContractorFamily',
@@ -198,6 +279,18 @@
         });
       },
       submitForm() {
+        if (this.$route.params.id) {
+          let householdStatus = Cookies.get('householdStatus');
+          if (householdStatus !== '1') {
+            let msg = '当前承包方已' + Cookies.get('householdStatusText') + '，不能修改家庭成员信息';
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: msg,
+              duration:"2000"
+            });
+            return;
+          }
+        }
         this.$refs.formData.validate().then(() => {
           if (this.$route.params.id) {
             updateJtcy(this.form).then(response => {
@@ -251,7 +344,15 @@
           cybz: null,
           cybzsm: null,
           cycgfs: null,
-          gqzbh: null
+          gqzbh: null,
+          sfjtjjzzcy: 'Y',
+          isNew: 'N',
+          newAt: null,
+          elcbshjd: null,
+          xhjd: null,
+          wdyy: null,
+          sfhdr: 'N',
+          // householdStatus: '1',
         };
         this.cyzjlxText = '居民身份证';
       }
@@ -267,7 +368,17 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .elcbshjd_css .van-field__label {
+    -webkit-box-flex: 0;
+    -webkit-flex: none;
+    flex: none;
+    box-sizing: border-box;
+    width: 10.2em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }
diff --git a/src/views/contracted/village/contractor/contractorHeader.vue b/src/views/contracted/village/contractor/contractorHeader.vue
index d054565c..f5e3d89a 100644
--- a/src/views/contracted/village/contractor/contractorHeader.vue
+++ b/src/views/contracted/village/contractor/contractorHeader.vue
@@ -45,6 +45,7 @@
   import { contractorSignature, hangUp } from "@/api/contracted/cbf";
   import vueEsign from "vue-esign";
   import $ from "jquery";
+  import Cookies from "js-cookie";
 
   export default {
     name: 'contractedVillageHeader',
@@ -86,6 +87,8 @@
       goBack() {
         getDept(this.deptId).then(response => {
           this.$router.push({path:'/contracted/village/contractor', query: { deptId: this.deptId, deptName: response.data.deptName }});
+          Cookies.remove('householdStatus');
+          Cookies.remove('householdStatusText');
         });
       },
       handleSign() {
diff --git a/src/views/contracted/village/contractor/contractorLand.vue b/src/views/contracted/village/contractor/contractorLand.vue
index def8b93e..422794c5 100644
--- a/src/views/contracted/village/contractor/contractorLand.vue
+++ b/src/views/contracted/village/contractor/contractorLand.vue
@@ -122,7 +122,7 @@
         });
       },
       getContractorList() {
-        listCbf({deptId: this.$route.params.deptId}).then(response => {
+        listCbf({deptId: this.$route.params.deptId, householdStatus: '1'}).then(response => {
           this.contractorList = response.rows;
         });
       },
diff --git a/src/views/contracted/village/contractor/contractorLandDetail.vue b/src/views/contracted/village/contractor/contractorLandDetail.vue
index 88fb0a40..f6a93ae4 100644
--- a/src/views/contracted/village/contractor/contractorLandDetail.vue
+++ b/src/views/contracted/village/contractor/contractorLandDetail.vue
@@ -30,6 +30,28 @@
           </van-picker>
         </van-popup>
         <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field
+          v-model="syqxzText"
+          label="所有权性质："
+          placeholder="请选择所有权性质"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showOwnership = true"
+        />
+        <van-popup v-model="showOwnership" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="syqxzOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmOwnershipOptions"
+            @cancel="showOwnership = false"
+          />
+        </van-popup>
         <van-field
           v-model="tdlylxText"
           label="土地利用类型："
@@ -103,13 +125,45 @@
             </van-radio-group>
           </template>
         </van-field>
-        <van-field v-model="form.htmjm" type="number" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
         <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="100" />
         <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
-        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" type="textarea" rows="3" :border="false" input-align="right" maxlength="250" />
+        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" maxlength="250" />   <!-- type="textarea" rows="3" -->
+
+        <van-field
+          v-model="qdfsText"
+          label="经营权取得方式："
+          placeholder="请选择经营权取得方式"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="right"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showQdfs = true"
+        />
+        <van-popup v-model="showQdfs" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="qdfsOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmQdfsOptions"
+            @cancel="showQdfs = false"
+          />
+        </van-popup>
+        <van-field v-model="form.htmjm" type="number" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.yhtmjm" type="number" label="原合同面积(亩)：" placeholder="请输入原合同面积(亩)" :border="false" input-align="right" />
+        <van-field v-model="form.lzhtbm" label="流转合同代码：" placeholder="请输入流转合同代码" :border="false" input-align="right" maxlength="18" />
+        <van-field v-model="form.sfqqqg" label="是否确权确股：" placeholder="请选择是否确权确股" :border="false" input-align="right">
+          <template #input>
+            <van-radio-group v-model="form.sfqqqg" direction="horizontal">
+              <van-radio v-for="item in sfqqqgOptions" :key="item.dictValue" :name="item.dictValue">{{ item.dictLabel }}</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
 
         <div class="mapBox">
           <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
@@ -139,6 +193,9 @@
         isDisabled: false,                // 是否禁用
         form: {},                         // 承包地信息表单
         showLandCode: false,              // 控制地块代码弹出层的显示和隐藏
+        syqxzOptions: [],                 // 所有权性质字典
+        syqxzText: null,                  // 所有权性质标签名
+        showOwnership: false,             // 控制所有权性质字典弹出层的显示和隐藏
         tdlylxOptions: [],                // 土地利用类型字典
         tdlylxText: null,                 // 土地利用类型标签名
         showLandUseType: false,           // 控制土地利用类型字典弹出层的显示和隐藏
@@ -149,6 +206,10 @@
         tdytText: null,                   // 土地用途标签名
         showLandPurpose: false,           // 控制土地用途字典弹出层的显示和隐藏
         sfjbntOptions: [],                // 是否基本农田字典
+        qdfsOptions: [],                  // 承包经营权取得方式字典
+        qdfsText: null,                   // 经营权取得方式标签名
+        showQdfs: false,                  // 控制土地用途字典弹出层的显示和隐藏
+        sfqqqgOptions: [],                // 是否确权确股字典
         landList: [],                     // 地块信息列表
         taskStatus: null,                 // 调查任务的完成状态：1表示已完成，2表示未完成
         searchKeyword: '',                // 弹出框查询关键字
@@ -156,6 +217,9 @@
     },
     created() {
       this.taskStatus = Cookies.get('taskStatus');
+      this.getDicts("land_ownership").then(response => {
+        this.syqxzOptions = response.data;
+      });
       this.getDicts("land_use").then(response => {
         this.tdlylxOptions = response.data;
       });
@@ -167,6 +231,10 @@
       });
       this.getDicts("is_common").then(response => {
         this.sfjbntOptions = response.data;
+        this.sfqqqgOptions = response.data;
+      });
+      this.getDicts("jyq_method").then(response => {
+        this.qdfsOptions = response.data;
       });
     },
     mounted() {
@@ -211,9 +279,11 @@
       getDetail(){
         getCbdkxx(this.$route.params.id).then(response => {
           this.form = response.data;
+          this.syqxzText = this.selectDictLabel(this.syqxzOptions, response.data.syqxz);
           this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, response.data.tdlylx);
           this.dldjText = this.selectDictLabel(this.dldjOptions, response.data.dldj);
           this.tdytText = this.selectDictLabel(this.tdytOptions, response.data.tdyt);
+          this.qdfsText = this.selectDictLabel(this.qdfsOptions, response.data.cbjyqqdfs);
           if (response.data.theGeomJson) {
             this.form.theGeom = JSON.stringify(JSON.parse(response.data.theGeomJson).coordinates);
             this.$nextTick(() => {
@@ -230,19 +300,25 @@
           cbfbm: null,
           dkbm: null,
           dkmc: null,
+          syqxz: null,
           tdlylx: null,
           dldj: null,
           tdyt: null,
           sfjbnt: null,
-          htmjm: null,
           zjrxm: null,
           dkdz: null,
           dkxz: null,
           dknz: null,
           dkbz: null,
           dkbzxx: null,
-          theGeom: null
+          theGeom: null,
+          cbjyqqdfs: '110',
+          htmjm: null,
+          yhtmjm: null,
+          lzhtbm: null,
+          sfqqqg: null
         };
+        this.qdfsText = '家庭承包';
       },
       openLandCodePopup() {
         /* if (this.form.dkbm) {
@@ -257,6 +333,8 @@
       onConfirmLandCodeOptions(value) {
         this.form.dkbm = value.dkbm;
         this.form.dkmc = value.dkmc;
+        this.form.syqxz = value.syqxz;
+        this.syqxzText = this.selectDictLabel(this.syqxzOptions, value.syqxz);
         this.form.tdlylx = value.tdlylx;
         this.tdlylxText = this.selectDictLabel(this.tdlylxOptions, value.tdlylx);
         this.form.dldj = value.dldj;
@@ -279,6 +357,11 @@
         }
         this.showLandCode = false;
       },
+      onConfirmOwnershipOptions(value){
+        this.form.syqxz = value.dictValue;
+        this.syqxzText = value.dictLabel;
+        this.showOwnership = false;
+      },
       onConfirmLandUseTypeOptions(value) {
         this.form.tdlylx = value.dictValue;
         this.tdlylxText = value.dictLabel;
@@ -294,6 +377,11 @@
         this.tdytText = value.dictLabel;
         this.showLandPurpose = false;
       },
+      onConfirmQdfsOptions(value) {
+        this.form.cbjyqqdfs = value.dictValue;
+        this.qdfsText = value.dictLabel;
+        this.showQdfs = false;
+      },
       goBack() {
         this.$router.push({
           name: 'contractedVillageContractorLand',
@@ -382,7 +470,7 @@
   }
 
   /deep/ .van-field__label {
-    width: 7em;
+    width: 8em;
   }
 
   .tb_main{
diff --git a/src/views/contracted/village/employer/employer.vue b/src/views/contracted/village/employer/employer.vue
index 669bff61..8b15dc66 100644
--- a/src/views/contracted/village/employer/employer.vue
+++ b/src/views/contracted/village/employer/employer.vue
@@ -50,6 +50,20 @@
         <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="15" />
         <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="6" />
+        <van-field v-model="form.fbfdcy" label="调查员：" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="30" />
+        <van-field v-model="form.fbfdcrq" label="调查日期：" placeholder="请选择调查日期" required :rules="[{ required: true }]"
+                   :border="false" input-align="right" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
+        <van-popup v-model="showDcrq" position="bottom">
+          <van-datetime-picker
+            :value="form.fbfdcrq ? new Date(form.fbfdcrq) : new Date()"
+            type="date"
+            title="请选择调查日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmDcrq"
+            @cancel="showDcrq = false"
+          />
+        </van-popup>
         <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" type="textarea" rows="3" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="200" />
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
@@ -115,6 +129,10 @@
           resultImg: "", // 最终画布生成的base64图片
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
+        // 调查日期弹出层
+        showDcrq: false,
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
@@ -123,6 +141,8 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+    },
+    mounted() {
       this.getDetail();
     },
     methods: {
@@ -150,6 +170,10 @@
         this.credentialTypeText = value.dictLabel;
         this.showCredentialType = false;
       },
+      onConfirmDcrq(data) {
+        this.form.fbfdcrq = this.format(data, 'yyyy-MM-dd');
+        this.showDcrq = false;
+      },
       submitForm() {
         this.$refs.formData.validate().then(() => {
           if (this.form.id) {
@@ -192,6 +216,8 @@
           lxdh: null,
           fbfdz: null,
           yzbm: null,
+          fbfdcy: null,
+          fbfdcrq: null,
           fbfdcjs: null,
           fbfdcqz: null
         };
diff --git a/src/views/news/newDetail.vue b/src/views/news/newDetail.vue
index e48d9f1f..98b4be6c 100644
--- a/src/views/news/newDetail.vue
+++ b/src/views/news/newDetail.vue
@@ -15,6 +15,16 @@
       <van-col span="2"></van-col>
     </van-row>
     <div id="content"></div>
+
+    <div v-if="attachmentQueryList.length>0">
+      <van-divider>附件</van-divider>
+      <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
+        <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+        <template #icon>
+          <img src="../../assets/images/file_icon.png" style="display: block;width: 24px;margin-right: 5px;" alt="">
+        </template>
+      </van-cell>
+    </div>
   </div>
 </template>
 
@@ -25,6 +35,7 @@ export default {
   data() {
     return {
       detail:'',
+      attachmentQueryList:[]
     };
   },
   created() {
@@ -36,6 +47,19 @@ export default {
         console.log(response)
         this.detail = response.data
         document.getElementById('content').innerHTML = response.data.content;
+
+        if(response.data.attachment){
+          var content = response.data.attachment.split(',');
+          let list = [];
+          content.map(rr=>{
+            list.push({
+              fileUrl:rr,
+              fileName:rr.substr(27,rr.length)
+            })
+          })
+
+          this.attachmentQueryList = list;
+        }
       });
     },
   },
@@ -60,4 +84,11 @@ export default {
   img{
     width: 100%;
   }
+  /deep/.van-cell__title, .van-cell__value{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+    overflow: hidden;
+  }
 </style>
diff --git a/src/views/pest/agriculturalRecords.vue b/src/views/pest/agriculturalRecords/agriculturalRecords.vue
similarity index 52%
rename from src/views/pest/agriculturalRecords.vue
rename to src/views/pest/agriculturalRecords/agriculturalRecords.vue
index b9e06554..8ffe57b6 100644
--- a/src/views/pest/agriculturalRecords.vue
+++ b/src/views/pest/agriculturalRecords/agriculturalRecords.vue
@@ -7,23 +7,88 @@
       fixed
       placeholder
       @click-left="$router.push({path:'/pest/index'})"
-    />
+      @click-right="$router.push({path:'/pest/agriculturalRecordsAdd'})"
+    >
+      <template #right>
+        <van-icon name="add-o" size="20" />
+      </template>
+    </van-nav-bar>
 
+    <van-search align="center" placeholder="请输入搜索关键词" left-icon="../../../static/images/pest/search_icon.png" />
 
+    <div class="file_main">
+      <van-field
+        readonly
+        clickable
+        label="地块选择 |"
+        placeholder="请选择"
+        @click="showLand = true"
+        right-icon="list-switching"
+        label-width="auto"
+        :border="false"
+        :rules="[{ required: true , message:'请选择折旧方式' }]"
+      />
+      <van-popup v-model="showLand" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="landOptions"
+          @cancel="showLand = false"
+        />
+      </van-popup>
+
+      <van-field
+        readonly
+        clickable
+        label="时间选择 |"
+        placeholder="请选择"
+        @click="showTime = true"
+        right-icon="notes-o"
+        label-width="auto"
+        :border="false"
+        :rules="[{ required: true , message:'请选择折旧方式' }]"
+      />
+      <van-popup v-model="showTime" position="bottom">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          title="选择年月日"
+          :min-date="minDate"
+          :max-date="maxDate"
+        />
+      </van-popup>
+
+      <van-field readonly label="标题名称 |" placeholder="请输入" label-width="auto" :border="false" >
+        <template #button>
+          <p class="clear_file">重置</p>
+        </template>
+      </van-field>
+    </div>
+
+    <div class="statistics_main">
+      <p class="statistics_tt">共14条</p>
+      <div class="statistics_block">
+        <p>排序</p>
+        <van-icon name="exchange" style="transform: rotate(90deg)" />
+      </div>
+    </div>
 
     <div class="list_main">
       <van-list>
         <van-swipe-cell v-for="(item,index) in 10" :key="index" >
           <div class="item" @click="goDetail(item)">
-            <img src="../../../static/images/pest/index/pest_index_icon_15.png" alt="">
+            <img src="../../../../static/images/pest/list_img.png" alt="">
             <div class="info">
               <div class="title">
-                <p class="news_title">物品名称名称名称名称</p>
-                <p class="tips_mark">仓库</p>
+                <p class="news_title">记录人员</p>
+                <p class="tips_mark">王响</p>
+              </div>
+              <div class="title">
+                <p class="news_title">农事记录</p>
+                <p class="tips_mark">耕地浇灌农事记录</p>
               </div>
-              <div class="time">
-                <p>库存量 <span>+100</span></p>
-                <p>预警值 <span>50</span></p>
+              <div class="title">
+                <p class="news_title">记录日期</p>
+                <p class="tips_mark">2023.02.02 21:57 星期四</p>
               </div>
             </div>
           </div>
@@ -56,85 +121,44 @@
 </template>
 <script>
   import Cookies from "js-cookie";
-  import { listSurveyTask } from "@/api/contracted";
-  import { getInfo, logout } from "@/api/login";
 
   export default {
-    name: "contractedIndex",
+    name: "agriculturalRecords",
     data() {
       return {
-        showPopover: false,
-        // 通过 actions 属性来定义菜单选项
-        actions: [
-          { text: '修改密码',value:1 },
-          { text: '退出登录',value:2 }
-        ],
-        nickName: null,
-        phone: null,
-        // 调查任务
-        surveyTask: {
-          'FINISHED': [],         // 已完成任务
-          'UNFINISHED': []        // 进行中任务
-        },
-        // 任务选项
-        taskOption: 'FINISHED',
+        landOptions:[],
+        showLand:false,
+        showTime:false,
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
       };
     },
     created() {
-      this.getUserInfo();
+
     },
     methods: {
-      getUserInfo() {
-        getInfo().then(response => {
-          this.nickName = response.user.nickName;
-          this.phone = response.user.phonenumber;
-          this.getList(response.user.userId);
-        });
-      },
-      getList(userId){
-        listSurveyTask({userId: userId}).then(response => {
-          this.surveyTask = response.data;
-        });
-      },
-      goDetail(item){
-        // 调查任务完成状态：已完成标记为1，未完成标记为2
-        let status = '1';
-        if (item.surStatus === 'UNFINISHED') {
-          status = '2';
-        }
-        Cookies.set('taskStatus', status, { expires: 30 });
-        this.$router.push({path:'/contracted/village/contractor', query: { deptId: item.deptId, deptName: item.deptName }})
-      },
-      onSelect(action) {
-        switch (action.value) {
-          case 1:
-            this.$router.push({path:'/contracted/user/passWord'})
-            break;
-          case 2:
-            this.loginOut();
-            break;
-        }
-      },
-      changeTaskOption(option) {
-        this.taskOption = option;
-      },
-      loginOut() {
-        logout().then(res => {
-          this.$router.push({ path: '/contracted/login' });
-        })
-      }
+
     },
   };
 </script>
 <style scoped lang="scss">
 
   .app-container{
-    background: #F2F6F2 url("../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
     background-size: 100% auto;
     height: 100vh;
     padding: 0 4vw;
   }
 
+  .clear_file{
+    background: linear-gradient(to right , #8AE15B , #BBFE9C);
+    color: #ffffff;
+    padding: 0 25px;
+    border-radius: 100vh;
+    font-size: .3rem;
+  }
+
   /deep/ .van-nav-bar{
     background: transparent;
   }
@@ -147,9 +171,45 @@
     border: none;
   }
 
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
   .list_main{
     margin-top: 15PX;
-    /*height: 35vh;*/
+    height: 65vh;
     overflow-y: scroll;
     .item{
       border-radius: 30px;
@@ -160,32 +220,32 @@
       display: flex;
       align-items: center;
       img{
-        width: 12%;
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
         margin-right: 2vh;
+        display: block;
       }
       .info{
         flex: 1;
         .title{
           display: flex;
-          font-size: 32px;
           align-items: center;
           height: 58px;
-          justify-content: space-between;
           .news_title{
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 1;
             word-break: break-all;
             overflow: hidden;
-            font-weight: bold;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
           }
           .tips_mark{
-            font-size: 14PX;
+            font-size: .35rem;
             color: #1C234C;
             text-align: center;
-            flex-shrink: 0;
-            background: linear-gradient(to right,#8AE15B,#BBFE9C);
-            padding: 5px 25px;
             border-radius: 100vh;
           }
         }
@@ -239,7 +299,7 @@
           .icon{
             width: 22PX;
             height: 29PX;
-            background: url('../../assets/images/sunVillage_info/signature_icon_03.png') no-repeat;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.png') no-repeat;
             background-size: 100% 100%;
             display: block;
           }
@@ -250,7 +310,7 @@
           .icon {
             width: 26PX;
             height: 25PX;
-            background: url('../../assets/images/sunVillage_info/signature_icon_02.png') no-repeat;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_02.png') no-repeat;
             background-size: 100% 100%;
             display: block;
           }
@@ -261,7 +321,7 @@
           .icon {
             width: 29PX;
             height: 21PX;
-            background: url('../../assets/images/sunVillage_info/signature_icon_04.png') no-repeat;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_04.png') no-repeat;
             background-size: 100% 100%;
             display: block;
           }
@@ -272,7 +332,7 @@
           .icon {
             width: 29px;
             height: 21px;
-            background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
+            background: url('../../../assets/images/sunVillage_info/list_icon_10.png') no-repeat;
             background-size: 100% 100%;
             display: block;
           }
diff --git a/src/views/pest/agriculturalRecords/agriculturalRecordsAdd.vue b/src/views/pest/agriculturalRecords/agriculturalRecordsAdd.vue
new file mode 100644
index 00000000..95d55a07
--- /dev/null
+++ b/src/views/pest/agriculturalRecords/agriculturalRecordsAdd.vue
@@ -0,0 +1,300 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="农事记录"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/agriculturalRecords'})"
+    />
+
+    <div class="file_main top">
+      <van-field
+        readonly
+        clickable
+        label="地块选择"
+        placeholder="请选择"
+        @click="showLand = true"
+        right-icon="arrow-down"
+        :border="false"
+        :rules="[{ required: true , message:'请选择折旧方式' }]"
+      />
+      <van-popup v-model="showLand" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="landOptions"
+          @cancel="showLand = false"
+        />
+      </van-popup>
+      <van-field label="记录人" placeholder="请输入" :border="false" />
+      <van-field label="标题" placeholder="请输入" :border="false" />
+    </div>
+
+    <div class="file_main center">
+      <van-field readonly label="内容" :border="false" />
+      <van-field placeholder="请输入" type="textarea" rows="4" autosize :border="false" style="padding-top: 0;" />
+    </div>
+
+    <div class="file_main bottom">
+      <van-field readonly label="农事图片" :border="false" />
+      <div class="load_block">
+        <van-uploader :after-read="afterRead" />
+      </div>
+    </div>
+
+    <div class="btn_main">
+      <van-button color="#CECECE" round block>取消</van-button>
+      <van-button color="linear-gradient(to right , #8AE15B , #BBFE9C)" round block>确定</van-button>
+    </div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+
+  export default {
+    name: "agriculturalRecordsAdd",
+    data() {
+      return {
+        landOptions:[],
+        showLand:false,
+        showTime:false,
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        console.log(file);
+      },
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background-size: 100% auto;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  .btn_main{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 5vh;
+    button:nth-child(2){
+      margin-left: 5vh;
+    }
+  }
+
+  .clear_file{
+    background: linear-gradient(to right , #8AE15B , #BBFE9C);
+    color: #ffffff;
+    padding: 0 25px;
+    border-radius: 100vh;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .top.van-field__label{
+    border-right: 1px solid #ddd;
+  }
+
+  /deep/ .center textarea{
+    background: #F5F8F6;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+
+  .load_block{
+    padding: 0 32px;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/pest/growthMonitoring/growthMonitoring.vue b/src/views/pest/growthMonitoring/growthMonitoring.vue
new file mode 100644
index 00000000..7032872f
--- /dev/null
+++ b/src/views/pest/growthMonitoring/growthMonitoring.vue
@@ -0,0 +1,481 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="长势监测"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/index'})"
+    />
+
+    <div class="flex_app">
+      <div class="flex_main flex_main_left">
+        <p class="flex_num">小麦<span>（皖麦50号）</span></p>
+        <p class="flex_name">当前作物</p>
+        <i></i>
+      </div>
+
+      <div class="flex_main">
+        <div class="flex_block">
+          <i class="icon icon1"></i>
+          <div class="flex_nr">
+            <p class="flex_num">返青期</p>
+            <p class="flex_name">物候期</p>
+          </div>
+        </div>
+        <div class="flex_block">
+          <i class="icon icon2"></i>
+          <div class="flex_nr">
+            <p class="flex_num">35.5<span class="flex_unit">亩</span></p>
+            <p class="flex_name">种植面积</p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="作物长势地图" input-align="right">
+        <template #input>
+          <p class="time_box">2024-03-01<van-icon name="arrow-down" /></p>
+        </template>
+      </van-field>
+      <div class="file_swipe">
+        <img src="../../../../static/images/pest/map_bg.png" width="100%" alt="">
+      </div>
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="植被指数" input-align="right"/>
+      <div class="charts" id="main3"></div>
+    </div>
+
+    <div class="bottom"></div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import * as echarts from "echarts";
+
+  export default {
+    name: "insectMonitoring",
+    data() {
+      return {
+        landOptions:[],
+        showLand:false,
+        showTime:false,
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      this.chart3();
+    },
+    methods: {
+      chart3(){
+        var chartDom = document.getElementById('main3');
+        var myChart = echarts.init(chartDom);
+        var option;
+
+        option = {
+          grid: {
+            top:'15%',
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          legend: {
+            top: 10,
+            right: "5%",
+            itemWidth: 10,
+            itemHeight: 10,
+            // padding: [5, 10],
+            textStyle: {
+              fontSize: 14,
+              color: "#a6c8dd",
+              padding: [3, 0, 0, 0],
+            },
+          },
+          xAxis: {
+            type: 'category',
+            data: [
+              '03-03',
+              '03-04',
+              '03-05',
+              '03-06',
+              '03-07',
+              '03-08',
+              '03-09',
+              '03-10',
+              '03-11',
+              '03-12',
+              '03-13',
+              '03-14',
+              '03-15',
+              '03-16',
+              '03-17',
+              '03-18',
+            ]
+          },
+          yAxis: {
+            type: 'value',
+            name: '虫害只'
+          },
+          series: [
+            {
+              data: [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                10,
+                0,
+                0,
+                0,
+                0,
+                0,
+                5,
+                0,
+                7,
+                0,
+              ],
+              type: 'line',
+              lineStyle: {
+                width: 1,
+                color: 'rgba(142, 277, 97, 1)'
+              },
+              stack: 'Total',
+              smooth: true,
+              showSymbol: false,
+              areaStyle: {
+                opacity: 0.8,
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: 'rgba(142, 277, 97, .8)'
+                  },
+                  {
+                    offset: 1,
+                    color: 'rgba(142, 277, 97, 0)'
+                  }
+                ])
+              },
+            }
+          ]
+        };
+
+        option && myChart.setOption(option);
+      }
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background-size: 100% auto;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  .flex_app{
+    display: flex;
+    .flex_main_left{
+      flex: 1;
+      background: url("../../../../static/images/pest/flex_main_left_bg.png") no-repeat center;
+      background-size: 100% 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      padding: 0 20px;
+      margin-right: 16px;
+      .flex_num{font-size: .45rem;color: #ffffff;font-weight: bold;span{font-size: .25rem;font-weight: normal;}}
+      .flex_unit{font-size: .25rem;color: #9F9F9F;font-weight: normal;}
+      .flex_name{font-size: .3rem;color: #ffffff;}
+      i{
+        display: block;
+        width: 4.5vh;
+        height: 4.5vh;
+        background: url("../../../../static/images/pest/flex_main_left_icon.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .flex_main{
+    flex: 1;
+    display: flex;
+    margin-top: 16px;
+    flex-direction: column;
+    .flex_block{
+      flex: 1;
+      position: relative;
+      padding: 1vh;
+      margin-top: 16px;
+      display: flex;
+      align-items: center;
+      border-radius: 15PX;
+      background: #ffffff;
+      .flex_y{
+        font-size: .35rem;
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 10px 10px 10px 20px;
+        line-height: 1;
+        border-bottom-left-radius: 15PX;
+      }
+      .flex_nr{
+        display: flex;
+        flex-direction: column;
+        align-items: baseline;
+        justify-content: space-evenly;
+        .flex_num{font-size: .45rem;color: #000000;font-weight: bold;}
+        .flex_unit{font-size: .25rem;color: #9F9F9F;font-weight: normal;}
+        .flex_name{font-size: .3rem;color: #9F9F9F;}
+      }
+      &:nth-child(1){
+        margin-top: 0px;
+      }
+      i{
+        display: block;
+        width: 4.5vh;
+        height: 4.5vh;
+        margin-right: 15px;
+      }
+      .icon1{
+        background: url("../../../../static/images/pest/growth_icon_01.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon2{
+        background: url("../../../../static/images/pest/growth_icon_02.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .time_box{
+    font-size: .3rem;
+    background: #F5F8F6;
+    color: rgba(28,35,76,.5);
+    padding:0 15PX;
+    border-radius: 100vh;
+  }
+
+  .my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20PX;
+    line-height: 300PX;
+    text-align: center;
+    background-color: #39a9ed;
+    border-radius: 15PX;
+  }
+
+  .charts{
+    height: 30vh;
+  }
+
+  .file_swipe{
+    padding: 36px;
+  }
+
+  .bottom{
+    padding-bottom: 10vh;
+  }
+
+  /deep/ .center textarea{
+    background: #F5F8F6;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/pest/index.vue b/src/views/pest/index.vue
index d5207d72..3a1fce03 100644
--- a/src/views/pest/index.vue
+++ b/src/views/pest/index.vue
@@ -39,23 +39,23 @@
         <img src="../../../static/images/pest/index/pest_index_icon_7.png" alt="">
         <p>农事记录</p>
       </van-grid-item>
-      <van-grid-item>
+      <van-grid-item :to="{name:'insectMonitoring'}">
         <img src="../../../static/images/pest/index/pest_index_icon_8.png" alt="">
         <p>虫情监测</p>
       </van-grid-item>
-      <van-grid-item>
+      <van-grid-item :to="{name:'soilTesting'}">
         <img src="../../../static/images/pest/index/pest_index_icon_9.png" alt="">
         <p>土壤检测</p>
       </van-grid-item>
-      <van-grid-item>
+      <van-grid-item :to="{name:'weather'}">
         <img src="../../../static/images/pest/index/pest_index_icon_10.png" alt="">
         <p>气象服务</p>
       </van-grid-item>
-      <van-grid-item>
+      <van-grid-item :to="{name:'temperatureAndHumidity'}">
         <img src="../../../static/images/pest/index/pest_index_icon_11.png" alt="">
         <p>温湿度</p>
       </van-grid-item>
-      <van-grid-item>
+      <van-grid-item :to="{name:'growthMonitoring'}">
         <img src="../../../static/images/pest/index/pest_index_icon_12.png" alt="">
         <p>长势监测</p>
       </van-grid-item>
diff --git a/src/views/pest/insectMonitoring/insectMonitoring.vue b/src/views/pest/insectMonitoring/insectMonitoring.vue
new file mode 100644
index 00000000..dfd77fd7
--- /dev/null
+++ b/src/views/pest/insectMonitoring/insectMonitoring.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="虫情监测"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/index'})"
+    />
+
+    <div class="file_main">
+      <van-field
+        readonly
+        clickable
+        label="虫情设备"
+        placeholder="请选择"
+        @click="showLand = true"
+        right-icon="arrow-down"
+        label-width="auto"
+        :border="false"
+        input-align="right"
+        :rules="[{ required: true , message:'请选择' }]"
+      />
+      <van-popup v-model="showLand" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="landOptions"
+          @cancel="showLand = false"
+        />
+      </van-popup>
+    </div>
+
+    <div class="file_main center">
+      <van-field readonly label="内容" :border="false" />
+      <van-field placeholder="请输入" type="textarea" rows="4" autosize :border="false" style="padding-top: 0;" />
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="实景图片" input-align="right">
+        <template #input>
+          <p class="time_box">2024-03-01<van-icon name="arrow-down" /></p>
+        </template>
+      </van-field>
+      <div class="file_swipe">
+        <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
+          <van-swipe-item>1</van-swipe-item>
+          <van-swipe-item>2</van-swipe-item>
+          <van-swipe-item>3</van-swipe-item>
+          <van-swipe-item>4</van-swipe-item>
+        </van-swipe>
+      </div>
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="虫害趋势" input-align="right">
+        <template #input>
+          <p class="time_box">2024-03-01<van-icon name="arrow-down" /></p>
+        </template>
+      </van-field>
+      <div class="charts" id="main3"></div>
+    </div>
+
+    <div class="bottom"></div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import * as echarts from "echarts";
+
+  export default {
+    name: "insectMonitoring",
+    data() {
+      return {
+        landOptions:[],
+        showLand:false,
+        showTime:false,
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      this.chart3();
+    },
+    methods: {
+      chart3(){
+        var chartDom = document.getElementById('main3');
+        var myChart = echarts.init(chartDom);
+        var option;
+
+        option = {
+          grid: {
+            top:'15%',
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          legend: {
+            top: 10,
+            right: "5%",
+            itemWidth: 10,
+            itemHeight: 10,
+            // padding: [5, 10],
+            textStyle: {
+              fontSize: 14,
+              color: "#a6c8dd",
+              padding: [3, 0, 0, 0],
+            },
+          },
+          xAxis: {
+            type: 'category',
+            data: [
+              '03-03',
+              '03-04',
+              '03-05',
+              '03-06',
+              '03-07',
+              '03-08',
+              '03-09',
+              '03-10',
+              '03-11',
+              '03-12',
+              '03-13',
+              '03-14',
+              '03-15',
+              '03-16',
+              '03-17',
+              '03-18',
+            ]
+          },
+          yAxis: {
+            type: 'value',
+            name: '虫害只'
+          },
+          series: [
+            {
+              data: [
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                10,
+                0,
+                0,
+                0,
+                0,
+                0,
+                5,
+                0,
+                0,
+                0,
+              ],
+              type: 'line'
+            }
+          ]
+        };
+
+        option && myChart.setOption(option);
+      }
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background-size: 100% auto;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  .time_box{
+    font-size: .3rem;
+    background: #F5F8F6;
+    color: rgba(28,35,76,.5);
+    padding:0 15PX;
+    border-radius: 100vh;
+  }
+
+  .my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20PX;
+    line-height: 300PX;
+    text-align: center;
+    background-color: #39a9ed;
+    border-radius: 15PX;
+  }
+
+  .charts{
+    height: 30vh;
+  }
+
+  .file_swipe{
+    padding: 36px;
+  }
+
+  .bottom{
+    padding-bottom: 10vh;
+  }
+
+  /deep/ .center textarea{
+    background: #F5F8F6;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/pest/soilTesting/soilTesting.vue b/src/views/pest/soilTesting/soilTesting.vue
new file mode 100644
index 00000000..3fbfffad
--- /dev/null
+++ b/src/views/pest/soilTesting/soilTesting.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="土壤检测"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/index'})"
+    />
+
+    <div class="file_main">
+      <van-field readonly label="土壤检测" input-align="right">
+        <template #input>
+          <p class="time_box">采集时间：2024-03-18  17：17</p>
+        </template>
+      </van-field>
+      <div style="padding: 16px;">
+        <div class="flex_main">
+          <div class="flex_block green">
+            <p class="flex_y green">优</p>
+            <div class="flex_nr">
+              <p class="flex_num">17.0</p>
+              <p class="flex_unit">℃</p>
+              <p class="flex_name">土壤温度</p>
+            </div>
+          </div>
+          <div class="flex_block orange">
+            <p class="flex_y orange">良</p>
+            <div class="flex_nr">
+              <p class="flex_num">35.5</p>
+              <p class="flex_unit">%</p>
+              <p class="flex_name">土壤湿度</p>
+            </div>
+          </div>
+        </div>
+        <div class="flex_main">
+          <div class="flex_block blue">
+            <p class="flex_y blue">优</p>
+            <div class="flex_nr">
+              <p class="flex_num">567.86</p>
+              <p class="flex_unit">mg/L</p>
+              <p class="flex_name">土壤盐分</p>
+            </div>
+          </div>
+          <div class="flex_block green">
+            <div class="flex_nr">
+              <p class="flex_num">-0.631</p>
+              <p class="flex_unit">m</p>
+              <p class="flex_name">土壤深度</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="file_main center">
+      <van-field readonly label="内容" :border="false" />
+      <van-field readonly v-model="textarea" placeholder="请输入" type="textarea" autosize :border="false" style="padding-top: 0;" />
+    </div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import * as echarts from "echarts";
+
+  export default {
+    name: "soilTesting",
+    data() {
+      return {
+        textarea:'当前土壤湿度较低，土壤温度较低，请注意农事的防护'
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background-size: 100% auto;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  .flex_main{
+    display: flex;
+    &:nth-child(1){
+      margin-bottom: 16px;
+    }
+    .flex_block{
+      flex: 1;
+      position: relative;
+      padding: 2vh 0;
+      .flex_y{
+        font-size: .35rem;
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 10px 10px 10px 20px;
+        line-height: 1;
+        border-bottom-left-radius: 15PX;
+        &.green{
+          background: #ADF1C2;
+          color: #19D77C;
+        }
+        &.orange{
+          background: #FFE9BA;
+          color: #FDCD63;
+        }
+        &.blue{
+          background: #B3DCFB;
+          color: #53B1F6;
+        }
+      }
+      .flex_nr{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: space-evenly;
+        .flex_num{font-size: .6rem;color: #000000;font-weight: bold;}
+        .flex_unit{font-size: .4rem;color: #9F9F9F;}
+        .flex_name{font-size: .35rem;color: #666666;}
+      }
+      &.green{
+        background: #EDFCE1;
+      }
+      &.orange{
+        background: #FEF4DF;
+      }
+      &.blue{
+        background: #DCEFFD;
+      }
+      &:nth-child(2){
+        margin-left: 16px;
+      }
+    }
+  }
+
+  .time_box{
+    font-size: .3rem;
+    color: rgba(28,35,76,.5);
+  }
+
+  .file_swipe{
+    padding: 36px;
+  }
+
+  .bottom{
+    padding-bottom: 10vh;
+  }
+
+  /deep/ .center textarea{
+    background: #FEECEF;
+    color: #F7738C;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue b/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue
new file mode 100644
index 00000000..50cee09e
--- /dev/null
+++ b/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue
@@ -0,0 +1,512 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="温湿度"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/index'})"
+    />
+
+    <div class="file_main">
+      <van-field
+        readonly
+        clickable
+        label="当前地块"
+        placeholder="请选择"
+        @click="showLand = true"
+        right-icon="arrow-down"
+        label-width="auto"
+        :border="false"
+        input-align="right"
+        :rules="[{ required: true , message:'请选择' }]"
+      />
+      <van-popup v-model="showLand" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="landOptions"
+          @cancel="showLand = false"
+        />
+      </van-popup>
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="采集数据" input-align="right">
+        <template #input>
+          <p class="time_box">设备1<van-icon name="arrow-down" /></p>
+        </template>
+      </van-field>
+      <div class="charts" id="main3"></div>
+    </div>
+
+    <div class="bottom"></div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import * as echarts from "echarts";
+
+  export default {
+    name: "insectMonitoring",
+    data() {
+      return {
+        landOptions:[],
+        showLand:false,
+        showTime:false,
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      this.chart3();
+    },
+    methods: {
+      chart3(){
+        var chartDom = document.getElementById('main3');
+        var myChart = echarts.init(chartDom);
+        let colors = ['#8CE25E','#2562FE']
+        var option;
+
+        option = {
+          grid: {
+            top:'15%',
+            left: '5%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          legend: {
+            top: 10,
+            right: "5%",
+            itemWidth: 10,
+            itemHeight: 10,
+            // padding: [5, 10],
+            textStyle: {
+              fontSize: 14,
+              color: "#a6c8dd",
+              padding: [3, 0, 0, 0],
+            },
+          },
+          xAxis: {
+            type: 'category',
+            data: [
+              '03-03',
+              '03-04',
+              '03-05',
+              '03-06',
+              '03-07',
+              '03-08',
+              '03-09',
+              '03-10',
+              '03-11',
+              '03-12',
+              '03-13',
+              '03-14',
+              '03-15',
+              '03-16',
+              '03-17',
+              '03-18',
+            ]
+          },
+          yAxis: [
+            {
+              type: 'value',
+              name: '温度\n℃',
+              position: 'left',
+              alignTicks: true,
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: colors[0]
+                }
+              }
+            },
+            {
+              type: 'value',
+              name: '湿度\n%',
+              position: 'left',
+              alignTicks: true,
+              offset: 30,
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: colors[1]
+                }
+              },
+            }
+          ],
+          series: [
+            {
+              data: [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                10,
+                0,
+                0,
+                0,
+                0,
+                0,
+                5,
+                0,
+                7,
+                0,
+              ],
+              type: 'line',
+              lineStyle: {
+                width: 1,
+                color: colors[0]
+              },
+              stack: 'Total',
+              smooth: true,
+              showSymbol: false,
+              yAxisIndex: 0, // 使用Y轴1
+            },
+            {
+              data: [
+                10,
+                20,
+                30,
+                40,
+                50,
+                60,
+                10,
+                11,
+                35,
+                28,
+                15,
+                8,
+                5,
+                18,
+                7,
+                1,
+              ],
+              type: 'line',
+              lineStyle: {
+                width: 1,
+                color: colors[1]
+              },
+              stack: 'Total',
+              smooth: true,
+              showSymbol: false,
+              yAxisIndex: 1, // 使用Y轴1
+            }
+          ]
+        };
+
+        option && myChart.setOption(option);
+      }
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #F2F6F2 url("../../../../static/images/pest/index/pest_index_bg.png") no-repeat top;
+    background-size: 100% auto;
+    height: 100vh;
+    padding: 0 4vw;
+  }
+
+  .flex_app{
+    display: flex;
+    .flex_main_left{
+      flex: 1;
+      background: url("../../../../static/images/pest/flex_main_left_bg.png") no-repeat center;
+      background-size: 100% 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      padding: 0 20px;
+      margin-right: 16px;
+      .flex_num{font-size: .45rem;color: #ffffff;font-weight: bold;span{font-size: .25rem;font-weight: normal;}}
+      .flex_unit{font-size: .25rem;color: #9F9F9F;font-weight: normal;}
+      .flex_name{font-size: .3rem;color: #ffffff;}
+      i{
+        display: block;
+        width: 4.5vh;
+        height: 4.5vh;
+        background: url("../../../../static/images/pest/flex_main_left_icon.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .flex_main{
+    flex: 1;
+    display: flex;
+    margin-top: 16px;
+    flex-direction: column;
+    .flex_block{
+      flex: 1;
+      position: relative;
+      padding: 1vh;
+      margin-top: 16px;
+      display: flex;
+      align-items: center;
+      border-radius: 15PX;
+      background: #ffffff;
+      .flex_y{
+        font-size: .35rem;
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 10px 10px 10px 20px;
+        line-height: 1;
+        border-bottom-left-radius: 15PX;
+      }
+      .flex_nr{
+        display: flex;
+        flex-direction: column;
+        align-items: baseline;
+        justify-content: space-evenly;
+        .flex_num{font-size: .45rem;color: #000000;font-weight: bold;}
+        .flex_unit{font-size: .25rem;color: #9F9F9F;font-weight: normal;}
+        .flex_name{font-size: .3rem;color: #9F9F9F;}
+      }
+      &:nth-child(1){
+        margin-top: 0px;
+      }
+      i{
+        display: block;
+        width: 4.5vh;
+        height: 4.5vh;
+        margin-right: 15px;
+      }
+      .icon1{
+        background: url("../../../../static/images/pest/growth_icon_01.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon2{
+        background: url("../../../../static/images/pest/growth_icon_02.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .time_box{
+    font-size: .3rem;
+    background: #F5F8F6;
+    color: rgba(28,35,76,.5);
+    padding:0 15PX;
+    border-radius: 100vh;
+  }
+
+  .my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20PX;
+    line-height: 300PX;
+    text-align: center;
+    background-color: #39a9ed;
+    border-radius: 15PX;
+  }
+
+  .charts{
+    height: 30vh;
+  }
+
+  .file_swipe{
+    padding: 36px;
+  }
+
+  .bottom{
+    padding-bottom: 10vh;
+  }
+
+  /deep/ .center textarea{
+    background: #F5F8F6;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #000000;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/pest/weather/weather.vue b/src/views/pest/weather/weather.vue
new file mode 100644
index 00000000..f65b3bcb
--- /dev/null
+++ b/src/views/pest/weather/weather.vue
@@ -0,0 +1,1652 @@
+<template>
+  <div class="app-container">
+
+    <van-nav-bar
+      title="气象服务"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.push({path:'/pest/index'})"
+    />
+
+    <div class="address_main">
+      <div class="address">
+        <p>当前天气</p>
+        <i class="border"></i>
+        <p><i></i>威海市</p>
+      </div>
+    </div>
+
+    <div class="celsius_main">
+      <div class="celsius_block">
+        <p class="celsius_num">16</p>
+        <p class="celsius_wea"><span>°</span><span>晴</span></p>
+      </div>
+      <div class="celsius_humidity">
+        <p>东南风 <span>2级</span></p>
+        <p>湿度 <span>66%</span></p>
+      </div>
+    </div>
+
+    <div id="weatherMain" ref="weatherMain"></div>
+
+    <div class="file_main center">
+      <van-field readonly label="农情评价" :border="false" />
+      <van-field readonly v-model="textarea" placeholder="请输入" type="textarea" autosize :border="false" style="padding-top: 0;" />
+    </div>
+
+    <div class="file_main">
+      <van-field readonly label="气象监测" input-align="right">
+        <template #input>
+          <p class="time_box2">2024-03-18<van-icon name="arrow-down" /></p>
+        </template>
+      </van-field>
+      <div style="padding: 16px;">
+        <p class="time_box">采集时间：2024-03-18  17：17</p>
+        <div class="flex_main">
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">17.0<span class="flex_unit">℃</span></p>
+              <p class="flex_name">温度</p>
+            </div>
+            <i class="icon icon1"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">%</span></p>
+              <p class="flex_name">湿度</p>
+            </div>
+            <i class="icon icon2"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">mm</span></p>
+              <p class="flex_name">雨量</p>
+            </div>
+            <i class="icon icon3"></i>
+          </div>
+        </div>
+        <div class="flex_main">
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">17.0<span class="flex_unit">m/s</span></p>
+              <p class="flex_name">风速</p>
+            </div>
+            <i class="icon icon4"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">hpa</span></p>
+              <p class="flex_name">气压</p>
+            </div>
+            <i class="icon icon5"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">ppm</span></p>
+              <p class="flex_name">CO2</p>
+            </div>
+            <i class="icon icon6"></i>
+          </div>
+        </div>
+        <div class="flex_main">
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">17.0<span class="flex_unit">lx</span></p>
+              <p class="flex_name">光照</p>
+            </div>
+            <i class="icon icon7"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">w/㎡</span></p>
+              <p class="flex_name">辐射</p>
+            </div>
+            <i class="icon icon8"></i>
+          </div>
+        </div>
+        <div class="flex_main">
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">17.0<span class="flex_unit">℃</span></p>
+              <p class="flex_name">土壤温度</p>
+            </div>
+            <i class="icon icon9"></i>
+          </div>
+          <div class="flex_block">
+            <div class="flex_nr">
+              <p class="flex_num">35.5<span class="flex_unit">%</span></p>
+              <p class="flex_name">土壤湿度</p>
+            </div>
+            <i class="icon icon10"></i>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="file_main center">
+      <van-field readonly label="预警信号" :border="false" />
+      <van-field readonly v-model="textarea" placeholder="请输入" type="textarea" autosize :border="false" style="padding-top: 0;" />
+    </div>
+
+    <div class="bottom"></div>
+
+  </div>
+</template>
+<script>
+  import Cookies from "js-cookie";
+  import * as echarts from "echarts";
+
+  import request from "@/utils/request";
+  export default {
+    name: "soilTesting",
+    data() {
+      return {
+        textarea:'当前土壤湿度较低，土壤温度较低，请注意农事的防护'
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      this.getWeather();
+    },
+    methods: {
+      getWeather(){
+        let url = 'https://devapi.qweather.com/v7/weather/7d?key=8956360de63949c78d7d1eb884b07bc9&location=101121307'
+        request(url).then((resp) => {
+          let weatherOptions = resp.daily;
+          weatherOptions.map(rr=>{
+            rr.windScaleDay = rr.windScaleDay + '级';
+            rr.fxDate = rr.fxDate.substr(5,11)
+          })
+          this.weatherOptions = weatherOptions;
+          this.leftBottomEchart(weatherOptions);
+        })
+      },
+      leftBottomEchart(data,type){
+
+        const extractField = (field, array) => {
+          return array.map(item => item[field]);
+        };
+
+        const dayOp = extractField('fxDate', data);//日期
+        const tempMaxOp = extractField('tempMax', data);//最高温度
+        const tempMinOp = extractField('tempMin', data);//最低温度
+        const textDayOp = extractField('textDay', data);//白天天气文字描述
+        const textNightOp = extractField('textNight', data);//夜间天气文字描述
+        const windDirDayOp = extractField('windDirDay', data);//风向
+        const windScaleDayOp = extractField('windScaleDay', data);//风力等级
+
+        var weatherMain = echarts.init(this.$refs.weatherMain);
+
+        var containerWidth = weatherMain.getWidth();//获取容器宽度
+        var containerHeight = weatherMain.getHeight();//获取容器高度
+
+        const constoption = {
+          grid: {
+            show: true,
+            backgroundColor: "transparent",
+            opacity: 0.3,
+            borderWidth: "0",
+            top: "40%",
+            bottom: "25%",
+            left:'5%',
+            right:'5%',
+          },
+          tooltip: {
+            trigger: "axis",
+            axisPointer: {
+              lineStyle: {
+                color: "transparent",
+              },
+            },
+          },
+          legend: {
+            show: false,
+          },
+          xAxis: [
+            // 日期
+            {
+              type: "category",
+              boundaryGap: false,
+              position: "top",
+              offset:containerHeight*0.24,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                formatter: ["{a|{value}}"].join("\n"),
+                rich: {
+                  a: {
+                    // color: 'white',
+                    fontSize: 12,
+                  },
+                },
+                color:'#ffffff'
+              },
+              nameTextStyle: {},
+              data: dayOp,
+            },
+            // 最高气温
+            {
+              type: "category",
+              boundaryGap: false,
+              show:false,
+              position: "top",
+              offset:0,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                formatter: ["{a|{value}}°"].join("\n"),
+                rich: {
+                  a: {
+                    // color: 'white',
+                    fontSize: 12,
+                  },
+                },
+                color:'#ffffff'
+              },
+              nameTextStyle: {},
+              data: tempMaxOp,
+            },
+            // 最低气温
+            {
+              type: "category",
+              boundaryGap: false,
+              show:false,
+              position: "top",
+              offset:-containerHeight*0.28,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                formatter: ["{a|{value}}°"].join("\n"),
+                rich: {
+                  a: {
+                    // color: 'white',
+                    fontSize: 12,
+                  },
+                },
+                color:'#ffffff'
+              },
+              nameTextStyle: {},
+              data: tempMinOp,
+            },
+            // 天气图标
+            {
+              type: "category",
+              boundaryGap: false,
+              position: "top",
+              offset:containerHeight*0.03,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                color:'#ffffff',
+                formatter: function (value, index) {
+                  return "{" + index + "| }\n{b|" + value + "}";
+                },
+                rich: {
+                  0: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 0; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  1: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 1; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  2: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 2; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  3: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 3; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  4: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 4; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  5: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 5; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  6: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 6; // 图片序号
+                        const weather = textDayOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  b: {
+                    // color: 'white',
+                    fontSize: 12,
+                    lineHeight: 30,
+                    height: 20,
+                  },
+                },
+              },
+              nameTextStyle: {
+                fontWeight: "bold",
+                fontSize: 19,
+              },
+              data: textDayOp,
+              // data: ["小雨", "小雨", "阴", "小雨", "多云", "小雨", "小雨"],
+            },
+            // 底部天气图标
+            {
+              type: "category",
+              boundaryGap: false,
+              zlevel: 100,
+              position: "top", // 轴线位置为底部
+              offset:-containerHeight*0.5,//偏移量，根据高度百分比偏移
+              axisLine: {
+                show: false, // 不显示轴线
+              },
+              axisTick: {
+                show: false, // 不显示刻度线
+              },
+              axisLabel: {
+                interval: 0,
+                color:'#ffffff',
+                formatter: function (value, index) {
+                  return "{" + index + "| }\n{b|" + value + "}";
+                },
+                rich: {
+                  0: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 0; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  1: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 1; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  2: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 2; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  3: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 3; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  4: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 4; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  5: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 5; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  6: {
+                    backgroundColor: {
+                      image: (() => {
+                        const index = 6; // 图片序号
+                        const weather = textNightOp[index]; // 根据图片序号获取对应的天气数据
+                        if (weather === "晴") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "多云") {
+                          return require("@/assets/images/weather/tianqi-duoyun.png");
+                        } else if (weather === "阴") {
+                          return require("@/assets/images/weather/tianqi-yin.png");
+                        } else if (weather === "晴雨") {
+                          return require("@/assets/images/weather/tianqi-zhenyu.png");
+                        } else if (weather === "小雨") {
+                          return require("@/assets/images/weather/tianqi-xiaoyu.png");
+                        } else if (weather === "中雨") {
+                          return require("@/assets/images/weather/tianqi-zhongyu.png");
+                        } else if (weather === "大雨") {
+                          return require("@/assets/images/weather/tianqi-dayu.png");
+                        } else if (weather === "暴雨") {
+                          return require("@/assets/images/weather/tianqi-baoyu.png");
+                        } else if (weather === "雷阵雨") {
+                          return require("@/assets/images/weather/tianqi-leizhenyu.png");
+                        } else if (weather === "晴雪") {
+                          return require("@/assets/images/weather/tianqi-zhenxue.png");
+                        } else if (weather === "小雪") {
+                          return require("@/assets/images/weather/tianqi-xiaoxue.png");
+                        } else if (weather === "中雪") {
+                          return require("@/assets/images/weather/tianqi-zhongxue.png");
+                        } else if (weather === "大雪") {
+                          return require("@/assets/images/weather/tianqi-daxue.png");
+                        } else if (weather === "暴雪") {
+                          return require("@/assets/images/weather/tianqi-baoxue.png");
+                        } else if (weather === "雷电") {
+                          return require("@/assets/images/weather/tianqi-qing.png");
+                        } else if (weather === "大风") {
+                          return require("@/assets/images/weather/tianqi-feng.png");
+                        } else if (weather === "雾") {
+                          return require("@/assets/images/weather/tianqi-wu.png");
+                        } else if (weather === "霾") {
+                          return require("@/assets/images/weather/tianqi-wumai.png");
+                        } else if (weather === "浮尘") {
+                          return require("@/assets/images/weather/tianqi-fuchen.png");
+                        } else if (weather === "沙尘") {
+                          return require("@/assets/images/weather/tianqi-yangsha.png");
+                        } else if (weather === "沙尘暴") {
+                          return require("@/assets/images/weather/tianqi-shachenbao.png");
+                        }
+                      })(),
+                    },
+                    height: 24,
+                    width: 24,
+                  },
+                  b: {
+                    // color: 'white',
+                    fontSize: 12,
+                    lineHeight: 30,
+                    height: 20,
+                  },
+                },
+              },
+              nameTextStyle: {
+                fontWeight: "bold",
+                fontSize: 19,
+              },
+              //data: weatherdata,
+              data: textNightOp,
+            },
+            // 风向
+            {
+              type: "category",
+              boundaryGap: false,
+              position: "top",
+              offset:-containerHeight*0.52,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                formatter: ["{a|{value}}"].join("\n"),
+                rich: {
+                  a: {
+                    // color: 'white',
+                    fontSize: 12,
+                  },
+                },
+                color:'#ffffff'
+              },
+              nameTextStyle: {},
+              data: windDirDayOp,
+            },
+            // 风力
+            {
+              type: "category",
+              boundaryGap: false,
+              position: "top",
+              offset:-containerHeight*0.57,//偏移量，根据高度百分比偏移
+              zlevel: 100,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                formatter: ["{a|{value}}"].join("\n"),
+                rich: {
+                  a: {
+                    // color: 'white',
+                    fontSize: 12,
+                  },
+                },
+                color:'#ffffff'
+              },
+              nameTextStyle: {},
+              data: windScaleDayOp,
+            },
+          ],
+          yAxis: {
+            type: "value",
+            show: false,
+            axisLabel: {
+              formatter: "{value} °C",
+              color: "white",
+            },
+          },
+          series: [
+            // 最高气温
+            {
+              name: "最高气温",
+              type: "line",
+              data: tempMaxOp,
+              symbolSize: 3,
+              showSymbol: true,
+              smooth: true,
+              itemStyle: {
+                normal: {
+                  color: "#ffffff",
+                },
+              },
+              label: {
+                show: true,
+                position: "top",
+                // offset: 10, // 设置标签相对于数据点的偏移量
+                color: 'white',
+                formatter: "{c} °C",
+              },
+              lineStyle: {
+                width: 2,
+                color: "#ffffff",
+                // normal: {
+                //   color: "#4c9bfd",
+
+                //   shadowBlur: 10, // 阴影模糊度
+                //   shadowColor: "rgba(76, 155, 253, 0.3)", // 阴影颜色
+                // },
+              },
+              areaStyle: {
+                opacity: 1,
+                color: "transparent",
+              },
+            },
+            // 最低气温
+            {
+              name: "最低气温",
+              type: "line",
+              data: tempMinOp,
+              symbolSize: 3,
+              showSymbol: true,
+              smooth: true,
+              itemStyle: {
+                normal: {
+                  color: "#ffffff",
+                },
+              },
+              label: {
+                show: true,
+                position: "bottom",
+                color: 'white',
+                formatter: "{c} °C",
+              },
+              lineStyle: {
+                width: 2,
+                color: "#ffffff",
+              },
+              areaStyle: {
+                opacity: 1,
+                color: "transparent",
+              },
+            },
+          ],
+        };
+        if(type == 'redraw'){
+          setTimeout(() => {
+            weatherMain.setOption(constoption, true);
+            weatherMain.resize();
+          }, 1);
+        }else{
+          setTimeout(() => {
+            weatherMain.setOption(constoption);
+            weatherMain.resize();
+          },1)
+        }
+
+      }
+    },
+  };
+</script>
+<style scoped lang="scss">
+
+  .app-container{
+    background: #33A5FB url("../../../../static/images/pest/daytime.png") no-repeat right top;
+    height: 100vh;
+    padding: 0 4vw;
+    overflow-y: scroll;
+  }
+
+  .time_box2{
+    font-size: .3rem;
+    background: #F5F8F6;
+    color: rgba(28,35,76,.5);
+    padding:0 15PX;
+    border-radius: 100vh;
+  }
+
+  #weatherMain{
+    height: 40vh;
+    background:rgba(255,255,255,.2);
+    padding: 0 20px;
+    border-radius: 15PX;
+    margin-top: 3vh;
+  }
+
+  .celsius_main{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: #ffffff;
+    margin-top: 3vh;
+    .celsius_block{
+      display: flex;
+      /*align-items: baseline;*/
+      line-height: 1;
+      .celsius_num{
+        font-size: 1.5rem;
+        font-weight: bold;
+      }
+      .celsius_wea{
+        font-size: .35rem;
+        font-weight: normal;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+        span:nth-child(1){
+          font-weight: bold;
+          font-size: 1rem;
+        }
+      }
+    }
+    .celsius_humidity{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 3vh;
+      p{
+        padding: 0 20px;
+        font-size: .35rem;
+        color: rgba(255,255,255,.6);
+        &:nth-child(1){
+          border-right: 1px solid rgba(255,255,255,.6);
+        };
+        span{
+          color: #ffffff;
+          margin-left: 10px;
+        }
+      }
+    }
+
+  }
+
+  .address_main{
+    display: flex;
+  }
+
+  .address{
+    display: flex;
+    color: #ffffff;
+    background: rgba(255,255,255,.1);
+    font-size: .4rem;
+    padding: 10px 20px;
+    align-items: center;
+    border-radius: 10px;
+    .border{
+      display: block;
+      border-right: 1px solid #ffffff;
+      height: .3rem;
+      margin: 0 15px;
+    }
+    p:last-child{
+      display: flex;
+      align-items: center;
+      i{
+        display: block;
+        width: .4rem;
+        height: .4rem;
+        background: url("../../../../static/images/pest/address.png") no-repeat left center;
+        background-size: auto 90%;
+      }
+    }
+  }
+
+  .flex_main{
+    display: flex;
+    margin-top: 16px;
+    .flex_block{
+      flex: 1;
+      position: relative;
+      padding: 1vh;
+      border: 1px solid #B6E7A9;
+      margin-left: 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-radius: 15PX;
+      .flex_y{
+        font-size: .35rem;
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 10px 10px 10px 20px;
+        line-height: 1;
+        border-bottom-left-radius: 15PX;
+        &.green{
+          background: #ADF1C2;
+          color: #19D77C;
+        }
+        &.orange{
+          background: #FFE9BA;
+          color: #FDCD63;
+        }
+        &.blue{
+          background: #B3DCFB;
+          color: #53B1F6;
+        }
+      }
+      .flex_nr{
+        display: flex;
+        flex-direction: column;
+        align-items: baseline;
+        justify-content: space-evenly;
+        .flex_num{font-size: .45rem;color: #000000;font-weight: bold;}
+        .flex_unit{font-size: .25rem;color: #9F9F9F;font-weight: normal;}
+        .flex_name{font-size: .3rem;color: #666666;}
+      }
+      &:nth-child(1){
+        margin-left: 0px;
+      }
+      i{
+        display: block;
+        width: 2.5vh;
+        height: 2.5vh;
+      }
+      .icon1{
+        background: url("../../../../static/images/pest/weather/weather_icon_02.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon2{
+        background: url("../../../../static/images/pest/weather/weather_icon_01.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon3{
+        background: url("../../../../static/images/pest/weather/weather_icon_03.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon4{
+        background: url("../../../../static/images/pest/weather/weather_icon_04.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon5{
+        background: url("../../../../static/images/pest/weather/weather_icon_05.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon6{
+        background: url("../../../../static/images/pest/weather/weather_icon_06.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon7{
+        background: url("../../../../static/images/pest/weather/weather_icon_07.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon8{
+        background: url("../../../../static/images/pest/weather/weather_icon_08.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon9{
+        background: url("../../../../static/images/pest/weather/weather_icon_09.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+      .icon10{
+        background: url("../../../../static/images/pest/weather/weather_icon_10.png") no-repeat center;
+        background-size: 100% 100%;
+      }
+    }
+  }
+
+  .time_box{
+    font-size: .3rem;
+    color: rgba(28,35,76,.5);
+  }
+
+  .file_swipe{
+    padding: 36px;
+  }
+
+  .bottom{
+    padding-bottom: 10vh;
+  }
+
+  /deep/ .center textarea{
+    background: #F5F8F6;
+    color: #999999;
+    padding: 20px;
+  }
+
+  /deep/ .van-nav-bar{
+    background: transparent;
+  }
+  /deep/ .van-nav-bar__title{
+    color: #ffffff;
+  }
+
+  /deep/ .van-nav-bar .van-icon{
+    color: #ffffff;
+  }
+
+  /deep/ .van-hairline--bottom::after{
+    border: none;
+  }
+
+  /deep/ .van-search{
+    padding: 0;
+    background: transparent;
+  }
+  /deep/ .van-search__content{
+    padding: 5px 25px;
+    border-radius: 20px;
+  }
+  /deep/ .van-search .van-cell{
+    align-items: center;
+  }
+  .file_main{
+    background: #ffffff;
+    margin: 25px auto 0;
+    border-radius: 15PX;
+    overflow: hidden;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+  }
+  .statistics_main{
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin-top: 15PX;
+    font-size: .35rem;
+    line-height: 1;
+    .statistics_tt{
+      flex: 1; /* 占据剩余空间 */
+      text-align: center; /* 文字水平居中 */
+    }
+    .statistics_block{
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: 0;
+    }
+  }
+  .list_main{
+    margin-top: 15PX;
+    height: 65vh;
+    overflow-y: scroll;
+    .item{
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      padding:25px 32px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      img{
+        width: 174px;
+        height: 174px;
+        border-radius: 10px;
+        margin-right: 2vh;
+        display: block;
+      }
+      .info{
+        flex: 1;
+        .title{
+          display: flex;
+          align-items: center;
+          height: 58px;
+          .news_title{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            font-size: .35rem;
+            color: rgba(28,35,76,.7);
+            margin-right: 15px;
+          }
+          .tips_mark{
+            font-size: .35rem;
+            color: #1C234C;
+            text-align: center;
+            border-radius: 100vh;
+          }
+        }
+        .time{
+          font-size: 16PX;
+          color: #c1c1c1;
+          display: flex;
+          align-items: center;
+          margin-top: 5PX;
+          justify-content: space-between;
+          p:first-child{
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            word-break: break-all;
+            overflow: hidden;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+          p:last-child{
+            font-size: 16PX;
+            text-align: center;
+            flex-shrink: 0;
+            span{
+              color: #5fe495;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+    }
+
+    .operation{
+      display: flex;
+      align-items: center;
+      justify-content: right;
+      text-align: center;
+      border-radius: 30px;
+      background: #fff;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      height: 100%;
+      padding: 0 15Px;
+      margin-left: 10PX;
+      .opera_btn{
+        border-radius: 50%;
+        &.delete{
+          background:#df0707;
+          margin-left: 10PX;
+          .icon{
+            width: 22PX;
+            height: 29PX;
+            background: url('../../../assets/images/sunVillage_info/signature_icon_03.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/signature_icon_02.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/signature_icon_04.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;
+          }
+        }
+      }
+    }
+  }
+
+</style>
diff --git a/src/views/policy/policyDetail.vue b/src/views/policy/policyDetail.vue
index cdb14d97..23b78dac 100644
--- a/src/views/policy/policyDetail.vue
+++ b/src/views/policy/policyDetail.vue
@@ -15,6 +15,16 @@
       <van-col span="2"></van-col>
     </van-row>
     <div id="content"></div>
+
+    <div v-if="attachmentQueryList.length>0">
+      <van-divider>附件</van-divider>
+      <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
+        <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+        <template #icon>
+          <img src="../../assets/images/file_icon.png" style="display: block;width: 24px;margin-right: 5px;" alt="">
+        </template>
+      </van-cell>
+    </div>
   </div>
 </template>
 
@@ -25,6 +35,7 @@ export default {
   data() {
     return {
       detail:'',
+      attachmentQueryList:[]
     };
   },
   created() {
@@ -36,6 +47,20 @@ export default {
         console.log(response)
         this.detail = response.data
         document.getElementById('content').innerHTML = response.data.content;
+
+        if(response.data.attachment){
+          var content = response.data.attachment.split(',');
+          let list = [];
+          content.map(rr=>{
+            list.push({
+              fileUrl:rr,
+              fileName:rr.substr(27,rr.length)
+            })
+          })
+
+          this.attachmentQueryList = list;
+        }
+
       });
     },
   },
@@ -52,5 +77,13 @@ export default {
   }
   #content{
     overflow: hidden;
+    font-size: 14PX;
+  }
+  /deep/.van-cell__title, .van-cell__value{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+    overflow: hidden;
   }
 </style>
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index a7b8dd62..15928895 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -124,6 +124,7 @@ export default {
     };
   },
   created() {
+    clearInterval();
     this.getDicts("project_type").then(response => {
       console.log(response)
       response.data.map(item => {
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 37293bbc..3039cc4c 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -33,6 +33,10 @@
             <van-col span="5">挂牌价</van-col>
             <van-col span="19" class="price"><span>{{detail.price}}</span> {{detail.unit}}</van-col>
           </van-row>
+          <van-row v-if="detail.priceMax">
+            <van-col span="5">最高限价</van-col>
+            <van-col span="19" class="money"><span>{{ detail.priceMax }}</span> 元</van-col>
+          </van-row>
           <van-row>
             <van-col span="5">保证金</van-col>
             <van-col span="19" class="money"><span>{{ detail.deposit }}</span> 元</van-col>
@@ -370,7 +374,7 @@ export default {
               isSign=true
             }
           })
-          if (resresponse.data.auditStatus == 'Y'){
+          if (resresponse.data.activitiStatus == '3'){
             if (isSign){
               this.$toast({
                 icon: 'error', // 找到自己需要的图标
@@ -539,7 +543,11 @@ export default {
         if(this.getSignupData=="1"){
           this.isSignup=true
           this.btnMsg="立即竞价"
-          this.showBtn=true
+          if(this.detail.biddingType!='线下竞价'){
+            this.showBtn=true
+          }else{
+            this.btnMsg="立即竞价(暂不支持线上出价)"
+          }
           // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
         }else{
           this.btnMsg="未报名"
@@ -637,7 +645,11 @@ export default {
         if(this.getSignupData=="1"){
           this.isSignup=true
           this.btnMsg="立即竞价"
-          this.showBtn=true
+          if(this.detail.biddingType!='线下竞价'){
+            this.showBtn=true
+          }else{
+            this.btnMsg="立即竞价(暂不支持线上出价)"
+          }
           // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
         }else{
           this.btnMsg="未报名"
diff --git a/src/views/sunVillage_info/assetMapOpen.vue b/src/views/sunVillage_info/assetMapOpen.vue
index 697e5bb4..d735e518 100644
--- a/src/views/sunVillage_info/assetMapOpen.vue
+++ b/src/views/sunVillage_info/assetMapOpen.vue
@@ -72,7 +72,7 @@
                   </van-col>
                 </van-row>
                 <div class="gl_main">
-                  <template v-if="false">
+                  <template v-if="!contractionVisible">
                     <div class="headers">
                       <div class="flex3">合同编码</div>
                       <div class="flex3">合同名称</div>
@@ -84,12 +84,12 @@
                     <div class="desc_main">
                       <ul class="analysisTable_list">
                         <!--1-->
-                        <li v-for="item in contractionList" class="flex_item">
+                        <li v-for="item in contractionList" class="flex_item" @click="viewContractionInfo(item)">
                           <div class="flex3" @click="lookName(item.code)">{{item.code}}</div>
                           <div class="flex3" @click="lookName(item.name)">{{item.name}}</div>
                           <div class="flex3">{{item.secondParty}}</div>
                           <div class="flex3">{{item.totalAmount}}</div>
-                          <div class="flex3">{{selectDictLabel(contractionStatuOptions, item.contractionStatus)}}</div>
+                          <div class="flex3">{{item.contractionStatus}}</div>
                         </li>
                       </ul>
                     </div>
@@ -97,6 +97,7 @@
                   <template v-else>
                     <div class="headers">
                       <div>关联合同</div>
+                      <div class="back" @click="hideContractionInfo">&lt; 返回</div>
                     </div>
                     <van-row>
                       <van-col :span="4"><span class="title">合同编码:</span></van-col>
@@ -212,7 +213,7 @@
                   </van-col>
                 </van-row>
                 <div class="gl_main">
-                  <template v-if="false">
+                  <template v-if="!contractionVisible">
                     <div class="headers">
                       <div class="flex3">合同编码</div>
                       <div class="flex3">合同名称</div>
@@ -224,12 +225,12 @@
                     <div class="desc_main">
                       <ul class="analysisTable_list">
                         <!--1-->
-                        <li v-for="item in contractionList" class="flex_item">
+                        <li v-for="item in contractionList" class="flex_item" @click="viewContractionInfo(item)">
                           <div class="flex3" @click="lookName(item.code)">{{item.code}}</div>
                           <div class="flex3" @click="lookName(item.name)">{{item.name}}</div>
                           <div class="flex3">{{item.secondParty}}</div>
                           <div class="flex3" >{{item.totalAmount}}</div>
-                          <div class="flex3">{{selectDictLabel(contractionStatuOptions, item.contractionStatus)}}</div>
+                          <div class="flex3">{{item.contractionStatus}}</div>
                         </li>
                       </ul>
                     </div>
@@ -237,6 +238,7 @@
                   <template v-else>
                     <div class="headers">
                       <div>关联合同</div>
+                      <div class="back" @click="hideContractionInfo">&lt; 返回</div>
                     </div>
                     <van-row>
                       <van-col :span="4"><span class="title">合同编码:</span></van-col>
@@ -385,7 +387,7 @@
     width: 94%;
     position: fixed;
     z-index: 1001;
-    top: 50%;
+    top: 54%;
     transform: translateY(-50%);
     right: 3%;
     display: flex;
@@ -479,7 +481,7 @@
   }
   .gl_main{
     margin-top: .8vh;
-    height: 28.15vh;
+    height: 38.15vh;
     padding:0.92vh 0 0 0;
   .headers {
     height: 3.24vh;
@@ -492,10 +494,16 @@
     background: rgba(11,239,202,.3);
     padding-right: 0.53vw;
     margin-bottom: 1vh;
+    position: relative;
   .flex_left{
     text-align: left;
     padding-left: 0.83vw;
   }
+    .back {
+      cursor: pointer;
+      position: absolute;
+      left: 0.83vw;
+    }
   }
   .desc_main{
     height: 21.5vh;
@@ -524,6 +532,7 @@
     color: #fff;
     font-size: 1.29vh;
     position: relative;
+    cursor: pointer;
   // border-bottom: 1px solid rgba(255, 255, 255, 0.2);
   // &:hover {
       //     background: rgba(8, 85, 255, 0.6);
@@ -579,7 +588,7 @@
     getResourceList,
     assetPropertyDetail,
     assetResourceDetail,
-    openAttachmentList
+    openAttachmentList as attachmentList
   } from "@/api/sunVillage_info/fixedAssets";
   import {getQueryLand} from "@/api/sunVillage_info/homestead/application";
   import { getConfigKey } from "@/api/system/config";
@@ -610,6 +619,7 @@
         villageBorderLayerName: "",     // 乡镇边界图层名称
         contractionData: {},
         contractionAttachmentList: [],
+        contractionVisible:false,
       };
     },
     created() {
@@ -868,20 +878,15 @@
             if (ifConsole !="标注点") {
               let obj = {};
               assetResourceDetail(feature.values_.id, {translate_dict: 1, getAttachments: true,}).then((resp) => {
-                that.contractionList = resp.data.params.contractionAssetList;
+                that.contractionList = resp.data.params.contractionAssetList || [];
                 that.$set(obj, 'fileList', resp.data.params.attachments.map(rr=>{
                   return {
                     url:'/api'+rr.fileUrl
                   };
                 }));
-                that.contractionData = resp.data.params.contraction || {};
+                that.contractionData = {};
                 that.contractionAttachmentList = [];
-                if(resp.data.params.contraction)
-                  that.contractionAttachmentList = resp.data.params.contraction.params.attachments.map(rr=>{
-                    return {
-                      url:'/api'+rr.fileUrl
-                    };
-                  });
+                that.contractionVisible = false;
                 that.mapHaDataValue = true;
               });
               that.mapHasDateStatus = 0;
@@ -957,20 +962,15 @@
             } else {
               let obj = {};
               assetPropertyDetail(feature.values_.properties[0].value.values_.id, {translate_dict: 1, getAttachments: true,}).then((resp) => {
-                that.contractionList = resp.data.params.contractionAssetList;
+                that.contractionList = resp.data.params.contractionAssetList || [];
                 that.$set(obj, 'fileList', resp.data.params.attachments.map(rr=>{
                   return {
                     url:'/api'+rr.fileUrl
                   };
                 }));
-                that.contractionData = resp.data.params.contraction || {};
+                that.contractionData = {};
                 that.contractionAttachmentList = [];
-                if(resp.data.params.contraction)
-                  that.contractionAttachmentList = resp.data.params.contraction.params.attachments.map(rr=>{
-                    return {
-                      url:'/api'+rr.fileUrl
-                    };
-                  });
+                that.contractionVisible = false;
                 that.mapHaDataValue = true;
               });
               that.mapHasDateStatus = 1;
@@ -1084,6 +1084,7 @@
               that.mapHasData = obj;
             }
           }else {
+            that.contractionVisible = false;
             that.mapHaDataValue = false;
           }
         });
@@ -1114,6 +1115,26 @@
           });
         }
       },
+      viewContractionInfo(row) {
+        this.contractionData = row || {};
+        this.contractionAttachmentList = [];
+        attachmentList({
+          tableId: row.id,
+          tableName: 't_contraction_info',
+        }).then((resp) => {
+          this.contractionAttachmentList = resp.rows.map(rr=>{
+            return {
+              url:'/api'+rr.fileUrl
+            };
+          });
+        });
+        this.contractionVisible = true;
+      },
+      hideContractionInfo() {
+        this.contractionData = {};
+        this.contractionAttachmentList = [];
+        this.contractionVisible = false;
+      },
     },
   };
 </script>
diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue
index 52f4d120..558a4b73 100644
--- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -181,16 +181,16 @@
 
       },
       changeInform(val){
-        console.log(val)
         var that = this;
         var str = val;
         var numArr = str.match(/\d+/g)
-        var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
-        console.log(numArr)
-        console.log(nameArr)
+        var nameArr = str.match(/[\u4e00-\u9fa5]/g);
+        if(nameArr != null){
+          nameArr = nameArr.join("")
+        }
         if (numArr) {
           numArr.map(rr=>{
-            if (rr.length>16) {
+            if (rr.length>=16) {
               const carId = isBankCard(rr);
               if (carId) {
                 that.form.payee = nameArr;
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
index 3dfbbb53..1d6eb23f 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -329,11 +329,41 @@
       <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;"  v-if="isModifyOrder">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row v-if="!isModifyOrder">
@@ -681,6 +711,120 @@
           })
         });
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
       payeeDictLabel(datas, value) {
         var actions = [];
         Object.keys(datas).some((key) => {
@@ -1189,6 +1333,20 @@
           commonAttach(params1).then((r1) => {
             file.id=r1.id;
             file.fileUrl = r1.fileUrl;
+            let subIndex = r1.fileUrl.lastIndexOf(".");
+            let ext =  r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length);
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+            let fileData =  {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext};
+            if(obj === '1'){
+              this.fileList1.splice(-1, 1);
+              this.fileList1.push(fileData);
+            }else if(obj === '2'){
+              this.fileList2.splice(-1, 1);
+              this.fileList2.push(fileData);
+            }else{
+              this.fileList3.splice(-1, 1);
+              this.fileList3.push(fileData);
+            }
           })
         }
       },
@@ -1205,7 +1363,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -1217,7 +1377,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -1229,7 +1391,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue
index 192d3496..483ed764 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
-<!--    <van-nav-bar-->
-<!--      left-arrow-->
-<!--      fixed-->
-<!--      placeholder-->
-<!--      @click-left="$router.back(-1)"-->
-<!--    >-->
-<!--      <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-nav-bar-->
+    <!--      left-arrow-->
+    <!--      fixed-->
+    <!--      placeholder-->
+    <!--      @click-left="$router.back(-1)"-->
+    <!--    >-->
+    <!--      <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>-->
 
     <div class="header_main">
       添加备付金支出申请
@@ -124,11 +124,13 @@
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
-        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况"
+                   input-align="right" rows="3" label-width="auto"/>
       </div>
 
       <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
-      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <div class="main_box" v-if="capitalExpenditureOpen"
+           style="margin-bottom: 10px;margin-top: 10px;position:relative;">
         <van-field
           readonly
           clickable
@@ -149,8 +151,10 @@
             @cancel="showproject = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor"
+                   label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="projectForm.projectAmount"
+                   label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
         <van-field
           readonly
           clickable
@@ -171,7 +175,8 @@
             @cancel="showFundType = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum"
+                   label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
       </div>
       <p class="main_title" v-if="contractOpen">关联合同</p>
       <div class="main_box" v-if="contractOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
@@ -195,8 +200,10 @@
             @cancel="showcontract = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入合同编码' }]" v-model="infoForm.code" label="合同编码" placeholder="请输入合同编码" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="infoForm.totalAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同编码' }]" v-model="infoForm.code" label="合同编码"
+                   placeholder="请输入合同编码" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="infoForm.totalAmount"
+                   label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
       </div>
 
       <p class="main_title">付款方信息</p>
@@ -223,37 +230,85 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'可用余额不能为空' }]" readonly required label="可用余额（元）" v-model="form.payerAccount" placeholder="请输入可用余额" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'可用余额不能为空' }]" readonly required label="可用余额（元）"
+                   v-model="form.payerAccount" placeholder="请输入可用余额" input-align="right" label-width="auto"/>
       </div>
 
-      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
-        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+      <p class="main_title">收款方信息
+        <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button"
+                    class="addFamily"/>
+      </p>
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme"
+           :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0"
+                    @click="deleteChargeItme(index)"/>
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
-          <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方" placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入联系方式' }]" v-model="item.phone" label="联系方式" placeholder="请输入联系方式" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入申请使用金额' }]" v-model="item.incomeAmount" type="number"  label="申请使用金额（元）" placeholder="请输入申请使用金额" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途" placeholder="请输入资金用途" input-align="right" label-width="auto" />
+          <van-field required :rules="[{ required: true , message:'请输入收款方全称' }]" v-model="item.payee" label="收款方"
+                     placeholder="请输入收款方全称" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入联系方式' }]" v-model="item.phone" label="联系方式"
+                     placeholder="请输入联系方式" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入申请使用金额' }]" v-model="item.incomeAmount"
+                     type="number" label="申请使用金额（元）" placeholder="请输入申请使用金额" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入资金用途' }]" v-model="item.remark" label="资金用途"
+                     placeholder="请输入资金用途" input-align="right" label-width="auto"/>
         </div>
       </div>
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 0;">
-        <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead1" @delete="deleteFile1" style="margin-left:8px;"></van-uploader>
-        <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead2" @delete="deleteFile2" style="margin-left:8px;"></van-uploader>
-        <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead3" @delete="deleteFile3" style="margin-left:8px;"></van-uploader>
+        <van-cell value="收据"/>
+        <van-uploader v-model="fileList1" accept=".jpg,.png,.gif,.pdf" @click-preview="previewPreview"
+                      :after-read="beforeRead1" @delete="deleteFile1" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
+        <van-cell title="发票"/>
+        <van-uploader v-model="fileList2" accept=".jpg,.png,.gif,.pdf" @click-preview="previewPreview"
+                      :after-read="beforeRead2" @delete="deleteFile2"
+                      style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
+        <van-cell title="其他"/>
+        <van-uploader v-model="fileList3" accept=".jpg,.png,.gif,.pdf" @click-preview="previewPreview"
+                      :after-read="beforeRead3" @delete="deleteFile3"
+                      style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
             <!--            @click="goUpdate"-->
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i
+              style="margin-right: 1em;"></i>存
+            </van-button>
           </van-col>
           <van-col span="12" align="center">
             <!--            @click="goAdd"-->
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交
+            </van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -263,8 +318,10 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,selectApprovalByTemplateId,
-    cashSubmit , offlineCustomSubmit, getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    addTransfer, listPayee, updateTransfer, getProjectto, listProject, addProjectto, selectApprovalByTemplateId,
+    cashSubmit, offlineCustomSubmit, getAccount, getQmyeFlow, listInfo, getInfoto, addInfoto, listTemplate
+  } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     addCash,
@@ -274,73 +331,74 @@
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
   import moment from "moment";
+
   export default {
     name: "approvalAdd11",
     data() {
       return {
-        showtemplate:false,
-        showcontract:false,
-        showcapital:false,
-        showpayee:false,
-        showlasj:false,
-        showbankType:false,
-        showproject:false,
-        showFundType:false,
-        showpayer:false,
+        showtemplate: false,
+        showcontract: false,
+        showcapital: false,
+        showpayee: false,
+        showlasj: false,
+        showbankType: false,
+        showproject: false,
+        showFundType: false,
+        showpayer: false,
 
-        buttonType:'a',
+        buttonType: 'a',
 
         minDate: new Date(2000, 1, 1),
         maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
-        form:{},
-        fileList1:[],
-        fileList2:[],
-        fileList3:[],
-        capitalExpenditureType:'',
-        payee:'',
-        bankType:'',
+        form: {},
+        fileList1: [],
+        fileList2: [],
+        fileList3: [],
+        capitalExpenditureType: '',
+        payee: '',
+        bankType: '',
 
-        wfydlxDictionaries:[],
-        jglxDictionaries:[],
-        sysDictionaries:[],
-        capitalExpenditureTypeOptions:[],
-        bankTypeDictionaries:[],
-        projectFundTypeOptions:[],
-        projectFundTypeDictionaries:[],
-        projectList:[],
-        infoList:[],
-        payerOptions:[],
+        wfydlxDictionaries: [],
+        jglxDictionaries: [],
+        sysDictionaries: [],
+        capitalExpenditureTypeOptions: [],
+        bankTypeDictionaries: [],
+        projectFundTypeOptions: [],
+        projectFundTypeDictionaries: [],
+        projectList: [],
+        infoList: [],
+        payerOptions: [],
 
-        chargeItme:[],
-        chargeItmeShow:[],
+        chargeItme: [],
+        chargeItmeShow: [],
 
-        payeeList:[],
+        payeeList: [],
         // 查询参数
         queryParams: {
-          cashType:11,
+          cashType: 11,
           orderByColumn: "id",
           isAsc: "desc",
         },
-        capitalExpenditureOpen:false,
-        contractOpen:false,
-        projectForm:{
-          projectId:null,
-          projectName:null,
-          projectContractor:null,
-          projectAmount:null,
-          projectBillNum:null,
-          projectFundType:'1',
-          outId:null,
-          ynType:'2'
+        capitalExpenditureOpen: false,
+        contractOpen: false,
+        projectForm: {
+          projectId: null,
+          projectName: null,
+          projectContractor: null,
+          projectAmount: null,
+          projectBillNum: null,
+          projectFundType: '1',
+          outId: null,
+          ynType: '2'
         },
-        infoForm:{
-          infoId:null,
-          name:null,
-          code:null,
-          totalAmount:null,
-          contractionId:null,
-          transferId:null
+        infoForm: {
+          infoId: null,
+          name: null,
+          code: null,
+          totalAmount: null,
+          contractionId: null,
+          transferId: null
         },
         // 合同信息查询参数
         queryContractionParams: {
@@ -350,12 +408,12 @@
           orderByColumn: "endTime",
           isAsc: "desc",
         },
-        projectFundType:'',
-        uploadFiles1:[],
-        uploadFiles2:[],
-        uploadFiles3:[],
-        nowDate:"",
-        templateList:[],
+        projectFundType: '',
+        uploadFiles1: [],
+        uploadFiles2: [],
+        uploadFiles3: [],
+        nowDate: "",
+        templateList: [],
       };
     },
     created() {
@@ -368,7 +426,7 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
-      let queryParamsOld={
+      let queryParamsOld = {
         accountType: "101",
         status: "N",
       }
@@ -378,7 +436,7 @@
           console.log(res)
           // res['accountName'] = this.$store.state.user.bookName
           // res['id'] = this.$store.state.user.loginBookId
-          res['text'] = res.accountName+"余额："+res.balance
+          res['text'] = res.accountName + "余额：" + res.balance
           res['value'] = res.id
           res['bankAccountNumber'] = res.startDay
           res['payerFrom'] = '6'
@@ -391,47 +449,47 @@
       this.getTemplateList();
     },
     methods: {
-      goFlow(){
-        if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){
-          window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode;
-        }else{
-            this.$notify({ type: 'danger', message: '无审批流程！' });
+      goFlow() {
+        if (this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined") {
+          window.location = 'approvalProcess3?approvalTemplateId=' + this.form.approvalTemplateId + '&approvalMode=' + this.form.approvalMode;
+        } else {
+          this.$notify({type: 'danger', message: '无审批流程！'});
         }
       },
-      getTemplateList(){
+      getTemplateList() {
         let templateQueryParams = {
           // 分页
           pageNum: 1,
           pageSize: 999,
-          type :'3'
+          type: '3'
         };
         listTemplate(templateQueryParams).then(response => {
           this.templateList = response.rows;
         });
       },
-      onConfirmTemplate(data){
+      onConfirmTemplate(data) {
         selectApprovalByTemplateId(data.id).then(res => {
           this.showtemplate = false;
-          if(res.approvalDetails.length>0){
+          if (res.approvalDetails.length > 0) {
             this.form.approvalTemplateName = data.name
             this.form.approvalTemplateId = data.id
-          }else{
+          } else {
             this.form.approvalTemplateName = null
             this.form.approvalTemplateId = null
-            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+            this.$notify({type: 'danger', message: '此流程无节点，无法选择！'});
           }
         })
       },
-      getNowDate(){
+      getNowDate() {
         var _this = this;
         let yy = new Date().getFullYear();
-        let mm = new Date().getMonth()+1;
+        let mm = new Date().getMonth() + 1;
         let dd = new Date().getDate();
         _this.nowDate = moment(new Date()).format("YYYY-MM-DD");
       },
-      initProjectInfo(){
+      initProjectInfo() {
         let _this = this
-        let queryParams={
+        let queryParams = {
           pageNum: 1,
           pageSize: 100,
         }
@@ -439,16 +497,16 @@
           _this.projectList = response.rows;
           for (let i = 0; i < response.rows.length; i++) {
             //_this.projectList[i].set({text: response.rows[i].projectName, value: response.rows[i].id});
-            _this.$set(_this.projectList[i],"text",response.rows[i].projectName)
-            _this.$set(_this.projectList[i],"value",response.rows[i].id)
+            _this.$set(_this.projectList[i], "text", response.rows[i].projectName)
+            _this.$set(_this.projectList[i], "value", response.rows[i].id)
           }
         });
         listInfo(this.queryContractionParams).then(response => {
           _this.infoList = response.rows;
           for (let i = 0; i < response.rows.length; i++) {
             //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
-            _this.$set(_this.infoList[i],"text",response.rows[i].name)
-            _this.$set(_this.infoList[i],"value",response.rows[i].code)
+            _this.$set(_this.infoList[i], "text", response.rows[i].name)
+            _this.$set(_this.infoList[i], "value", response.rows[i].code)
           }
         });
       },
@@ -457,8 +515,8 @@
         this.form = {
           id: null,
           upId: null,
-          applyDate:this.nowDate,
-          approvalMode:'1',
+          applyDate: this.nowDate,
+          approvalMode: '1',
           downId: null,
           orderId: null,
           cashierId: null,
@@ -480,25 +538,25 @@
           clientPriority: "0"
         };
         this.processList = {}
-        this.projectForm={
-          projectId:null,
-          projectName:null,
-          projectContractor:null,
-          projectAmount:null,
-          projectBillNum:null,
-          projectFundType:'1',
-          outId:null,
-          ynType:'2'
+        this.projectForm = {
+          projectId: null,
+          projectName: null,
+          projectContractor: null,
+          projectAmount: null,
+          projectBillNum: null,
+          projectFundType: '1',
+          outId: null,
+          ynType: '2'
         }
       },
-      getChange(){
-        if(this.buttonType == 'update'){
+      getChange() {
+        if (this.buttonType == 'update') {
           this.goUpdate();
-        }else if(this.buttonType == 'add'){
+        } else if (this.buttonType == 'add') {
           this.goAdd();
         }
       },
-      getDictionaries(){
+      getDictionaries() {
         this.getDicts("capital_expenditure_type").then((res) => {
           for (let i = 0; i < res.data.length; i++) {
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
@@ -506,21 +564,21 @@
         });
         this.getPayeeList();
       },
-      getError(e){
-        this.$notify({ type: 'danger', message: e.errors[0].message });
+      getError(e) {
+        this.$notify({type: 'danger', message: e.errors[0].message});
       },
-      addChargeItme(index){
-        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
-          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+      addChargeItme(index) {
+        if (this.chargeItme.length > 0 && this.chargeItme[this.chargeItme.length - 1].payee == '') {
+          this.$notify({type: 'danger', message: '请勿添加多个空列表信息'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入提款金额！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].incomeAmount == '') {
+          this.$notify({type: 'danger', message: '请输入收款金额！'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].drawer == ''){
-          this.$notify({ type: 'danger', message: '请输入提款人！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].payee == '') {
+          this.$notify({type: 'danger', message: '请输入收款人！'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].remark == ''){
-          this.$notify({ type: 'danger', message: '请输入资金用途！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].remark == '') {
+          this.$notify({type: 'danger', message: '请输入资金用途！'});
           return;
         }
         this.chargeItme.splice(index + 1, 0, {
@@ -530,8 +588,8 @@
           drawer: "", //提款人
           incomeAmount: "", //提款金额
           bankType: "", //资金用途
-          showPayee:false,
-          showbankType:false
+          showPayee: false,
+          showbankType: false
         });
       },
       getPayeeList() {
@@ -540,7 +598,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
-          response.rows.map((res,index) => {
+          response.rows.map((res, index) => {
             this.payeeList[index].text = res.payee;
             this.payeeList[index].value = res.id;
           })
@@ -556,16 +614,16 @@
         })
         return actions.join('');
       },
-      onConfirmCapital(data){
-        if (data.value == 2){
+      onConfirmCapital(data) {
+        if (data.value == 2) {
           this.capitalExpenditureOpen = true;
           this.contractOpen = false
           this.infoForm = {};
-        }else if(data.value == 4){
+        } else if (data.value == 4) {
           this.capitalExpenditureOpen = false;
           this.contractOpen = true
           this.projectForm = {};
-        }else{
+        } else {
           this.capitalExpenditureOpen = false;
           this.contractOpen = false
           this.projectForm = {};
@@ -575,14 +633,14 @@
         this.form.capitalExpenditureType = data.value;
         this.showcapital = false;
       },
-      onConfirmFundType(data){
+      onConfirmFundType(data) {
         this.projectForm.projectFundType = data.value;
         this.projectFundType = data.text;
         this.showFundType = false;
       },
-      onConfirmContract(data){
+      onConfirmContract(data) {
         this.infoList.map(res => {
-          if(res.name==data.text){
+          if (res.name == data.text) {
             this.infoForm.contractionId = res.id;
             this.infoForm.name = res.name;
             this.infoForm.code = res.code;
@@ -591,9 +649,9 @@
         })
         this.showcontract = false;
       },
-      onConfirmProject(data){
+      onConfirmProject(data) {
         this.projectList.map(res => {
-          if(res.projectName==data.text){
+          if (res.projectName == data.text) {
             this.projectForm.projectId = res.id
             this.projectForm.projectName = res.projectName
             this.projectForm.projectContractor = res.projectContractor
@@ -602,131 +660,131 @@
         })
         this.showproject = false;
       },
-      onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+      onConfirmPayee(data, index) {
+        for (var i = 0; i < this.chargeItme.length; i++) {
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
-        this.payeeSelectChange(data.value , index)
+        this.payeeSelectChange(data.value, index)
       },
-      onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+      onConfirmBankType(data, index) {
+        for (var i = 0; i < this.chargeItme.length; i++) {
           this.chargeItme[i].showbankType = false;
         }
         this.chargeItme[index].bankTypeText = data.text;
         this.chargeItme[index].bankType = data.value;
         this.chargeItme[index].showbankType = false;
       },
-      onConfirmPayer(data){
+      onConfirmPayer(data) {
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.showpayer = false;
         this.selectChange(data.value)
       },
-      onConfirmLasj(data){
-        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+      onConfirmLasj(data) {
+        this.form.applyDate = this.getNowFormatDate(data).substr(0, 10);
         this.showlasj = false;
       },
-      accountTypeChange(e){
+      accountTypeChange(e) {
         this.payeeList = [];
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
-          response.rows.map((res,index) => {
+          response.rows.map((res, index) => {
             this.payeeList[index].text = res.payee;
             this.payeeList[index].value = res.id;
           })
         });
       },
-      goAdd(){
+      goAdd() {
         let _this = this
-        if(this.form.payerAccount==0){
-          this.$notify({ type: 'danger', message: '申请使用金额不能等于0！' });
+        if (this.form.payerAccount == 0) {
+          this.$notify({type: 'danger', message: '申请使用金额不能等于0！'});
           return false;
-        }else {
+        } else {
           let total = 0;
           this.chargeItme.forEach((money) => {
             total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
           });
           this.$set(this.form, "expenditureAmount", total);
-          if(parseFloat(this.form.payerAccount)<parseFloat(this.form.expenditureAmount)){
-            this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
+          if (parseFloat(this.form.payerAccount) < parseFloat(this.form.expenditureAmount)) {
+            this.$notify({type: 'danger', message: '申请使用金额不能大于可用余额！'});
             return false;
-          }else{
-            if(this.chargeItme.length<1){
-              this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          } else {
+            if (this.chargeItme.length < 1) {
+              this.$notify({type: 'danger', message: '请添加收款方信息'});
               return false;
             }
-            if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-              this.$notify({ type: 'danger', message: '转账附言禁止包含！' });
+            if (this.form.remark != null && this.form.remark.indexOf("|") != -1) {
+              this.$notify({type: 'danger', message: '转账附言禁止包含！'});
               return false;
             }
-            if(this.form.capitalExpenditureType==2){
-              if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-                this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            if (this.form.capitalExpenditureType == 2) {
+              if (this.projectForm.projectName == "" || this.projectForm.projectName == null) {
+                this.$notify({type: 'danger', message: '请选择项目名称！'});
                 return false;
               }
-              if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-                this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+              if (this.projectForm.projectBillNum == "" || this.projectForm.projectBillNum == null) {
+                this.$notify({type: 'danger', message: '请输入工程发票号！'});
                 return false;
               }
             }
-            if(this.form.capitalExpenditureType==4){
-              if(this.infoForm.name==""||this.infoForm.name==null){
-                this.$notify({ type: 'danger', message: '请选择合同名称！' });
+            if (this.form.capitalExpenditureType == 4) {
+              if (this.infoForm.name == "" || this.infoForm.name == null) {
+                this.$notify({type: 'danger', message: '请选择合同名称！'});
                 return false;
               }
-              if(this.infoForm.code==""||this.infoForm.code==null){
-                this.$notify({ type: 'danger', message: '请输入合同编码！' });
+              if (this.infoForm.code == "" || this.infoForm.code == null) {
+                this.$notify({type: 'danger', message: '请输入合同编码！'});
                 return false;
               }
-              if(this.infoForm.totalAmount==""||this.infoForm.totalAmount==null){
-                this.$notify({ type: 'danger', message: '请输入合同价款！' });
+              if (this.infoForm.totalAmount == "" || this.infoForm.totalAmount == null) {
+                this.$notify({type: 'danger', message: '请输入合同价款！'});
                 return false;
               }
             }
-            if((this.uploadFiles1==null||this.uploadFiles1.length==0)&&(this.uploadFiles2==null||this.uploadFiles2.length==0)&&(this.uploadFiles3==null||this.uploadFiles3.length==0)){
+            if ((this.uploadFiles1 == null || this.uploadFiles1.length == 0) && (this.uploadFiles2 == null || this.uploadFiles2.length == 0) && (this.uploadFiles3 == null || this.uploadFiles3.length == 0)) {
               Dialog.confirm({
                 title: '提示',
                 message: '此申请单中未上传任何附件，是否确认提交？',
               })
                 .then(() => {
                   addCash(this.form).then((response) => {
-                    this.chargeItme.map((res,idx) => {
+                    this.chargeItme.map((res, idx) => {
                       res.cashId = response.data.id
                       addCashdetail(res).then(r => {
-                        if(idx == (_this.chargeItme.length - 1)){
-                          if(_this.form.capitalExpenditureType==2){
+                        if (idx == (_this.chargeItme.length - 1)) {
+                          if (_this.form.capitalExpenditureType == 2) {
                             _this.projectForm.outId = response.data.id
                             _this.$set(_this.projectForm, "ynType", '2');
                             addProjectto(_this.projectForm).then(res => {
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
+                              offlineCustomSubmit(response.data.id).then(res => {
+                                _this.$toast.success('提交成功');
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
+                              })
                             })
-                          }else if(_this.form.capitalExpenditureType==4){
+                          } else if (_this.form.capitalExpenditureType == 4) {
                             _this.infoForm.transferId = response.data.id
                             addInfoto(_this.infoForm).then(res => {
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                            })
-                          }else{
                               offlineCustomSubmit(response.data.id).then(res => {
                                 _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
                               })
+                            })
+                          } else {
+                            offlineCustomSubmit(response.data.id).then(res => {
+                              _this.$toast.success('提交成功');
+                              setTimeout(function () {
+                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                              }, 2000)
+                            })
                           }
                         }
                       })
@@ -734,17 +792,18 @@
                     })
                   });
                 })
-            }else{
+            } else {
               addCash(this.form).then((response) => {
                 this.chargeItme.map(res => {
                   res.cashId = response.data.id
-                  addCashdetail(res).then(r => {})
+                  addCashdetail(res).then(r => {
+                  })
                 })
                 this.projectForm.outId = response.data.id
                 this.infoForm.transferId = response.data.id
                 this.$set(this.projectForm, "ynType", '2');
-                if(this.uploadFiles1!=null&&this.uploadFiles1.length>0){
-                  this.uploadFiles1.map((rr1,idx1) => {
+                if (this.uploadFiles1 != null && this.uploadFiles1.length > 0) {
+                  this.uploadFiles1.map((rr1, idx1) => {
                     let params1 = new FormData();
                     params1.append("tableId", response.data.id);
                     params1.append("tableName", "t_yinnong_transfer");
@@ -752,9 +811,9 @@
                     params1.append("fileType", "1");
                     params1.append("file", rr1);
                     commonAttach(params1).then((r1) => {
-                      if(idx1 == (_this.uploadFiles1.length-1)){
-                        if(_this.uploadFiles2!=null&&_this.uploadFiles2.length>0){
-                          _this.uploadFiles2.map((rr2,idx2) => {
+                      if (idx1 == (_this.uploadFiles1.length - 1)) {
+                        if (_this.uploadFiles2 != null && _this.uploadFiles2.length > 0) {
+                          _this.uploadFiles2.map((rr2, idx2) => {
                             let params2 = new FormData();
                             params2.append("tableId", response.data.id);
                             params2.append("tableName", "t_yinnong_transfer");
@@ -762,9 +821,9 @@
                             params2.append("fileType", "2");
                             params2.append("file", rr2);
                             commonAttach(params2).then((r2) => {
-                              if(idx2 == (_this.uploadFiles2.length-1)){
-                                if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                                  _this.uploadFiles3.map((rr3,idx3) => {
+                              if (idx2 == (_this.uploadFiles2.length - 1)) {
+                                if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                                  _this.uploadFiles3.map((rr3, idx3) => {
                                     let params3 = new FormData();
                                     params3.append("tableId", response.data.id);
                                     params3.append("tableName", "t_yinnong_transfer");
@@ -772,111 +831,111 @@
                                     params3.append("fileType", "3");
                                     params3.append("file", rr3);
                                     commonAttach(params3).then((r3) => {
-                                      if(idx3 == (_this.uploadFiles3.length-1)){
-                                        if(_this.form.capitalExpenditureType==2){
+                                      if (idx3 == (_this.uploadFiles3.length - 1)) {
+                                        if (_this.form.capitalExpenditureType == 2) {
                                           addProjectto(_this.projectForm).then(res => {
                                             offlineCustomSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
+                                              _this.chargeItme.map((resD, b) => {
+                                                resD.cashId = response.data.id
+                                                addCashdetail(resD).then((a, rD) => {
+                                                  if (b == (_this.chargeItme.length - 1)) {
+                                                    _this.$toast.success('提交成功');
+                                                    setTimeout(function () {
+                                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                                    }, 2000)
+                                                  }
                                                 })
                                               })
+                                            })
                                           })
-                                        } else if(_this.form.capitalExpenditureType==4){
+                                        } else if (_this.form.capitalExpenditureType == 4) {
                                           addInfoto(_this.infoForm).then(res => {
-                                              offlineCustomSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                          })
-                                        }else{
                                             offlineCustomSubmit(response.data.id).then(res => {
-                                              _this.chargeItme.map((resD,b) => {
+                                              _this.chargeItme.map((resD, b) => {
                                                 resD.cashId = response.data.id
-                                                addCashdetail(resD).then((a,rD) => {
-                                                  if(b ==  (_this.chargeItme.length-1)){
+                                                addCashdetail(resD).then((a, rD) => {
+                                                  if (b == (_this.chargeItme.length - 1)) {
                                                     _this.$toast.success('提交成功');
-                                                    setTimeout(function(){
-                                                      history.go(-1)
-                                                    },2000)
+                                                    setTimeout(function () {
+                                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                                    }, 2000)
                                                   }
                                                 })
                                               })
                                             })
+                                          })
+                                        } else {
+                                          offlineCustomSubmit(response.data.id).then(res => {
+                                            _this.chargeItme.map((resD, b) => {
+                                              resD.cashId = response.data.id
+                                              addCashdetail(resD).then((a, rD) => {
+                                                if (b == (_this.chargeItme.length - 1)) {
+                                                  _this.$toast.success('提交成功');
+                                                  setTimeout(function () {
+                                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                                  }, 2000)
+                                                }
+                                              })
+                                            })
+                                          })
                                         }
                                       }
                                     })
                                   })
-                                }else{
-                                  if(_this.form.capitalExpenditureType==2){
+                                } else {
+                                  if (_this.form.capitalExpenditureType == 2) {
                                     addProjectto(_this.projectForm).then(res => {
-                                        offlineCustomSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
+                                      offlineCustomSubmit(response.data.id).then(res => {
+                                        _this.chargeItme.map((resD, b) => {
+                                          resD.cashId = response.data.id
+                                          addCashdetail(resD).then((a, rD) => {
+                                            if (b == (_this.chargeItme.length - 1)) {
+                                              _this.$toast.success('提交成功');
+                                              setTimeout(function () {
+                                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                                              }, 2000)
+                                            }
                                           })
                                         })
+                                      })
                                     })
-                                  } else if(_this.form.capitalExpenditureType==4){
+                                  } else if (_this.form.capitalExpenditureType == 4) {
                                     addInfoto(_this.infoForm).then(res => {
                                       offlineCustomSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                    })
-                                  }else{
-                                    offlineCustomSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
+                                        _this.chargeItme.map((resD, b) => {
                                           resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
+                                          addCashdetail(resD).then((a, rD) => {
+                                            if (b == (_this.chargeItme.length - 1)) {
                                               _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
+                                              setTimeout(function () {
+                                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                                              }, 2000)
                                             }
                                           })
                                         })
                                       })
+                                    })
+                                  } else {
+                                    offlineCustomSubmit(response.data.id).then(res => {
+                                      _this.chargeItme.map((resD, b) => {
+                                        resD.cashId = response.data.id
+                                        addCashdetail(resD).then((a, rD) => {
+                                          if (b == (_this.chargeItme.length - 1)) {
+                                            _this.$toast.success('提交成功');
+                                            setTimeout(function () {
+                                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                                            }, 2000)
+                                          }
+                                        })
+                                      })
+                                    })
                                   }
                                 }
                               }
                             })
                           })
-                        }else if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                          _this.uploadFiles3.map((rr3,idx3) => {
+                        } else if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                          _this.uploadFiles3.map((rr3, idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", response.data.id);
                             params3.append("tableName", "t_yinnong_transfer");
@@ -884,112 +943,112 @@
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
                             commonAttach(params3).then((r3) => {
-                              if(idx3 ==(_this.uploadFiles3.length-1)){
-                                if(_this.form.capitalExpenditureType==2){
+                              if (idx3 == (_this.uploadFiles3.length - 1)) {
+                                if (_this.form.capitalExpenditureType == 2) {
                                   addProjectto(_this.projectForm).then(res => {
                                     offlineCustomSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
+                                      _this.chargeItme.map((resD, b) => {
+                                        resD.cashId = response.data.id
+                                        addCashdetail(resD).then((a, rD) => {
+                                          if (b == (_this.chargeItme.length - 1)) {
+                                            _this.$toast.success('提交成功');
+                                            setTimeout(function () {
+                                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                                            }, 2000)
+                                          }
                                         })
                                       })
+                                    })
                                   })
-                                } else if(_this.form.capitalExpenditureType==4){
+                                } else if (_this.form.capitalExpenditureType == 4) {
                                   addInfoto(_this.infoForm).then(res => {
                                     offlineCustomSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                  })
-                                }else{
-                                    offlineCustomSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
+                                      _this.chargeItme.map((resD, b) => {
                                         resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
+                                        addCashdetail(resD).then((a, rD) => {
+                                          if (b == (_this.chargeItme.length - 1)) {
                                             _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
+                                            setTimeout(function () {
+                                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                                            }, 2000)
                                           }
                                         })
                                       })
                                     })
+                                  })
+                                } else {
+                                  offlineCustomSubmit(response.data.id).then(res => {
+                                    _this.chargeItme.map((resD, b) => {
+                                      resD.cashId = response.data.id
+                                      addCashdetail(resD).then((a, rD) => {
+                                        if (b == (_this.chargeItme.length - 1)) {
+                                          _this.$toast.success('提交成功');
+                                          setTimeout(function () {
+                                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                                          }, 2000)
+                                        }
+                                      })
+                                    })
+                                  })
                                 }
                               }
                             })
                           })
-                        }else{
-                          if(_this.form.capitalExpenditureType==2){
+                        } else {
+                          if (_this.form.capitalExpenditureType == 2) {
                             addProjectto(_this.projectForm).then(res => {
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
+                              offlineCustomSubmit(response.data.id).then(res => {
+                                _this.chargeItme.map((resD, b) => {
+                                  resD.cashId = response.data.id
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
+                                      _this.$toast.success('提交成功');
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
+                                    }
                                   })
                                 })
+                              })
                             })
-                          } else if(_this.form.capitalExpenditureType==4){
+                          } else if (_this.form.capitalExpenditureType == 4) {
                             addInfoto(_this.infoForm).then(res => {
 
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                            })
-                          }else{
-                            offlineCustomSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
+                              offlineCustomSubmit(response.data.id).then(res => {
+                                _this.chargeItme.map((resD, b) => {
                                   resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
                                       _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
                                     }
                                   })
                                 })
                               })
+                            })
+                          } else {
+                            offlineCustomSubmit(response.data.id).then(res => {
+                              _this.chargeItme.map((resD, b) => {
+                                resD.cashId = response.data.id
+                                addCashdetail(resD).then((a, rD) => {
+                                  if (b == (_this.chargeItme.length - 1)) {
+                                    _this.$toast.success('提交成功');
+                                    setTimeout(function () {
+                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                    }, 2000)
+                                  }
+                                })
+                              })
+                            })
                           }
                         }
                       }
                     })
                   })
-                }else if(this.uploadFiles2!=null&&this.uploadFiles2.length>0){
-                  this.uploadFiles2.map((rr2,idx2) => {
+                } else if (this.uploadFiles2 != null && this.uploadFiles2.length > 0) {
+                  this.uploadFiles2.map((rr2, idx2) => {
                     let params = new FormData();
                     params.append("tableId", response.data.id);
                     params.append("tableName", "t_yinnong_transfer");
@@ -997,9 +1056,9 @@
                     params.append("fileType", "2");
                     params.append("file", rr2);
                     commonAttach(params).then((r2) => {
-                      if(idx2 == (_this.uploadFiles2.length-1)){
-                        if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                          _this.uploadFiles3.map((rr3,idx3) => {
+                      if (idx2 == (_this.uploadFiles2.length - 1)) {
+                        if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                          _this.uploadFiles3.map((rr3, idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", response.data.id);
                             params3.append("tableName", "t_yinnong_transfer");
@@ -1007,111 +1066,111 @@
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
                             commonAttach(params).then((r3) => {
-                              if(idx3 == (_this.uploadFiles3.length-1)){
-                                if(_this.form.capitalExpenditureType==2){
+                              if (idx3 == (_this.uploadFiles3.length - 1)) {
+                                if (_this.form.capitalExpenditureType == 2) {
                                   addProjectto(_this.projectForm).then(res => {
-                                      offlineCustomSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
+                                    offlineCustomSubmit(response.data.id).then(res => {
+                                      _this.chargeItme.map((resD, b) => {
+                                        resD.cashId = response.data.id
+                                        addCashdetail(resD).then((a, rD) => {
+                                          if (b == (_this.chargeItme.length - 1)) {
+                                            _this.$toast.success('提交成功');
+                                            setTimeout(function () {
+                                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                                            }, 2000)
+                                          }
                                         })
                                       })
+                                    })
                                   })
-                                } else if(_this.form.capitalExpenditureType==4){
+                                } else if (_this.form.capitalExpenditureType == 4) {
                                   addInfoto(_this.infoForm).then(res => {
-                                      offlineCustomSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                  })
-                                }else{
                                     offlineCustomSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
+                                      _this.chargeItme.map((resD, b) => {
                                         resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
+                                        addCashdetail(resD).then((a, rD) => {
+                                          if (b == (_this.chargeItme.length - 1)) {
                                             _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
+                                            setTimeout(function () {
+                                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                                            }, 2000)
                                           }
                                         })
                                       })
                                     })
+                                  })
+                                } else {
+                                  offlineCustomSubmit(response.data.id).then(res => {
+                                    _this.chargeItme.map((resD, b) => {
+                                      resD.cashId = response.data.id
+                                      addCashdetail(resD).then((a, rD) => {
+                                        if (b == (_this.chargeItme.length - 1)) {
+                                          _this.$toast.success('提交成功');
+                                          setTimeout(function () {
+                                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                                          }, 2000)
+                                        }
+                                      })
+                                    })
+                                  })
                                 }
                               }
                             })
                           })
-                        }else{
-                          if(_this.form.capitalExpenditureType==2){
+                        } else {
+                          if (_this.form.capitalExpenditureType == 2) {
                             addProjectto(_this.projectForm).then(res => {
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
+                              offlineCustomSubmit(response.data.id).then(res => {
+                                _this.chargeItme.map((resD, b) => {
+                                  resD.cashId = response.data.id
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
+                                      _this.$toast.success('提交成功');
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
+                                    }
                                   })
                                 })
+                              })
                             })
-                          } else if(_this.form.capitalExpenditureType==4){
+                          } else if (_this.form.capitalExpenditureType == 4) {
                             addInfoto(_this.infoForm).then(res => {
-                                offlineCustomSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                            })
-                          }else{
-                            offlineCustomSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
+                              offlineCustomSubmit(response.data.id).then(res => {
+                                _this.chargeItme.map((resD, b) => {
                                   resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
                                       _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
                                     }
                                   })
                                 })
                               })
+                            })
+                          } else {
+                            offlineCustomSubmit(response.data.id).then(res => {
+                              _this.chargeItme.map((resD, b) => {
+                                resD.cashId = response.data.id
+                                addCashdetail(resD).then((a, rD) => {
+                                  if (b == (_this.chargeItme.length - 1)) {
+                                    _this.$toast.success('提交成功');
+                                    setTimeout(function () {
+                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                    }, 2000)
+                                  }
+                                })
+                              })
+                            })
                           }
                         }
                       }
                     })
                   })
-                }else if(this.uploadFiles3!=null&&this.uploadFiles3.length>0){
-                  this.uploadFiles3.map((rr3,idx3) => {
+                } else if (this.uploadFiles3 != null && this.uploadFiles3.length > 0) {
+                  this.uploadFiles3.map((rr3, idx3) => {
                     let params = new FormData();
                     params.append("tableId", response.data.id);
                     params.append("tableName", "t_yinnong_transfer");
@@ -1119,104 +1178,104 @@
                     params.append("fileType", "3");
                     params.append("file", rr3);
                     commonAttach(params).then((r) => {
-                      if(idx3 == (_this.uploadFiles3.length-1)){
-                        if(_this.form.capitalExpenditureType==2){
+                      if (idx3 == (_this.uploadFiles3.length - 1)) {
+                        if (_this.form.capitalExpenditureType == 2) {
                           addProjectto(_this.projectForm).then(res => {
-                              offlineCustomSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
+                            offlineCustomSubmit(response.data.id).then(res => {
+                              _this.chargeItme.map((resD, b) => {
+                                resD.cashId = response.data.id
+                                addCashdetail(resD).then((a, rD) => {
+                                  if (b == (_this.chargeItme.length - 1)) {
+                                    _this.$toast.success('提交成功');
+                                    setTimeout(function () {
+                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                    }, 2000)
+                                  }
                                 })
                               })
+                            })
                           })
-                        } else if(_this.form.capitalExpenditureType==4){
+                        } else if (_this.form.capitalExpenditureType == 4) {
                           addInfoto(_this.infoForm).then(res => {
                             offlineCustomSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                          })
-                        }else{
-                          offlineCustomSubmit(response.data.id).then(res => {
-                              _this.chargeItme.map((resD,b) => {
+                              _this.chargeItme.map((resD, b) => {
                                 resD.cashId = response.data.id
-                                addCashdetail(resD).then((a,rD) => {
-                                  if(b ==  (_this.chargeItme.length-1)){
+                                addCashdetail(resD).then((a, rD) => {
+                                  if (b == (_this.chargeItme.length - 1)) {
                                     _this.$toast.success('提交成功');
-                                    setTimeout(function(){
-                                      history.go(-1)
-                                    },2000)
+                                    setTimeout(function () {
+                                      _this.$router.push({name: 'sunVillageApprovalList11'});
+                                    }, 2000)
                                   }
                                 })
                               })
                             })
+                          })
+                        } else {
+                          offlineCustomSubmit(response.data.id).then(res => {
+                            _this.chargeItme.map((resD, b) => {
+                              resD.cashId = response.data.id
+                              addCashdetail(resD).then((a, rD) => {
+                                if (b == (_this.chargeItme.length - 1)) {
+                                  _this.$toast.success('提交成功');
+                                  setTimeout(function () {
+                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                  }, 2000)
+                                }
+                              })
+                            })
+                          })
                         }
                       }
                     })
                   })
-                }else{
-                  if(this.form.capitalExpenditureType==2){
+                } else {
+                  if (this.form.capitalExpenditureType == 2) {
                     addProjectto(this.projectForm).then(res => {
-                        offlineCustomSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
+                      offlineCustomSubmit(response.data.id).then(res => {
+                        _this.chargeItme.map((resD, b) => {
+                          resD.cashId = response.data.id
+                          addCashdetail(resD).then((a, rD) => {
+                            if (b == (_this.chargeItme.length - 1)) {
+                              _this.$toast.success('提交成功');
+                              setTimeout(function () {
+                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                              }, 2000)
+                            }
                           })
                         })
+                      })
                     })
-                  } else if(this.form.capitalExpenditureType==4){
+                  } else if (this.form.capitalExpenditureType == 4) {
                     addInfoto(this.infoForm).then(res => {
-                        offlineCustomSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                    })
-                  }else{
                       offlineCustomSubmit(response.data.id).then(res => {
-                        _this.chargeItme.map((resD,b) => {
+                        _this.chargeItme.map((resD, b) => {
                           resD.cashId = response.data.id
-                          addCashdetail(resD).then((a,rD) => {
-                            if(b ==  (_this.chargeItme.length-1)){
+                          addCashdetail(resD).then((a, rD) => {
+                            if (b == (_this.chargeItme.length - 1)) {
                               _this.$toast.success('提交成功');
-                              setTimeout(function(){
-                                history.go(-1)
-                              },2000)
+                              setTimeout(function () {
+                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                              }, 2000)
                             }
                           })
                         })
                       })
+                    })
+                  } else {
+                    offlineCustomSubmit(response.data.id).then(res => {
+                      _this.chargeItme.map((resD, b) => {
+                        resD.cashId = response.data.id
+                        addCashdetail(resD).then((a, rD) => {
+                          if (b == (_this.chargeItme.length - 1)) {
+                            _this.$toast.success('提交成功');
+                            setTimeout(function () {
+                              _this.$router.push({name: 'sunVillageApprovalList11'});
+                            }, 2000)
+                          }
+                        })
+                      })
+                    })
                   }
                 }
               });
@@ -1224,50 +1283,51 @@
           }
         }
       },
-      goUpdate(){
+      goUpdate() {
         let _this = this
-        if(this.form.payerAccount==0){
-          this.$notify({ type: 'danger', message: '申请使用金额不能等于0！' });;
+        if (this.form.payerAccount == 0) {
+          this.$notify({type: 'danger', message: '申请使用金额不能等于0！'});
+          ;
           return false;
-        }else {
+        } else {
           let total = 0;
           this.chargeItme.forEach((money) => {
             total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
           });
           this.$set(this.form, "expenditureAmount", total);
-          if(parseFloat(this.form.payerAccount)<parseFloat(this.form.expenditureAmount)){
-            this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
+          if (parseFloat(this.form.payerAccount) < parseFloat(this.form.expenditureAmount)) {
+            this.$notify({type: 'danger', message: '申请使用金额不能大于可用余额！'});
             return false;
-          }else{
-            if(this.chargeItme.length<1){
-              this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          } else {
+            if (this.chargeItme.length < 1) {
+              this.$notify({type: 'danger', message: '请添加收款方信息'});
               return false;
             }
-            if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-              this.$notify({ type: 'danger', message: '转账附言禁止包含！' });
+            if (this.form.remark != null && this.form.remark.indexOf("|") != -1) {
+              this.$notify({type: 'danger', message: '转账附言禁止包含！'});
               return false;
             }
-            if(this.form.capitalExpenditureType==2){
-              if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-                this.$notify({ type: 'danger', message: '请选择项目名称！' });
+            if (this.form.capitalExpenditureType == 2) {
+              if (this.projectForm.projectName == "" || this.projectForm.projectName == null) {
+                this.$notify({type: 'danger', message: '请选择项目名称！'});
                 return false;
               }
-              if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-                this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+              if (this.projectForm.projectBillNum == "" || this.projectForm.projectBillNum == null) {
+                this.$notify({type: 'danger', message: '请输入工程发票号！'});
                 return false;
               }
             }
-            if(this.form.capitalExpenditureType==4){
-              if(this.infoForm.name==""||this.infoForm.name==null){
-                this.$notify({ type: 'danger', message: '请选择合同名称！' });
+            if (this.form.capitalExpenditureType == 4) {
+              if (this.infoForm.name == "" || this.infoForm.name == null) {
+                this.$notify({type: 'danger', message: '请选择合同名称！'});
                 return false;
               }
-              if(this.infoForm.code==""||this.infoForm.code==null){
-                this.$notify({ type: 'danger', message: '请输入合同编码！' });
+              if (this.infoForm.code == "" || this.infoForm.code == null) {
+                this.$notify({type: 'danger', message: '请输入合同编码！'});
                 return false;
               }
-              if(this.infoForm.totalAmount==""||this.infoForm.totalAmount==null){
-                this.$notify({ type: 'danger', message: '请输入合同价款！' });
+              if (this.infoForm.totalAmount == "" || this.infoForm.totalAmount == null) {
+                this.$notify({type: 'danger', message: '请输入合同价款！'});
                 return false;
               }
             }
@@ -1275,8 +1335,8 @@
               this.projectForm.outId = response.data.id
               this.infoForm.transferId = response.data.id
               this.$set(this.projectForm, "ynType", '2');
-              if(this.uploadFiles1!=null&&this.uploadFiles1.length>0){
-                this.uploadFiles1.map((rr1,idx1) => {
+              if (this.uploadFiles1 != null && this.uploadFiles1.length > 0) {
+                this.uploadFiles1.map((rr1, idx1) => {
                   let params1 = new FormData();
                   params1.append("tableId", response.data.id);
                   params1.append("tableName", "t_yinnong_transfer");
@@ -1284,9 +1344,9 @@
                   params1.append("fileType", "1");
                   params1.append("file", rr1);
                   commonAttach(params1).then((r1) => {
-                    if(idx1 == (_this.uploadFiles1.length-1)){
-                      if(_this.uploadFiles2!=null&&_this.uploadFiles2.length>0){
-                        _this.uploadFiles2.map((rr2,idx2) => {
+                    if (idx1 == (_this.uploadFiles1.length - 1)) {
+                      if (_this.uploadFiles2 != null && _this.uploadFiles2.length > 0) {
+                        _this.uploadFiles2.map((rr2, idx2) => {
                           let params2 = new FormData();
                           params2.append("tableId", response.data.id);
                           params2.append("tableName", "t_yinnong_transfer");
@@ -1294,9 +1354,9 @@
                           params2.append("fileType", "2");
                           params2.append("file", rr2);
                           commonAttach(params2).then((r2) => {
-                            if(idx2 == (_this.uploadFiles2.length-1)){
-                              if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                                _this.uploadFiles3.map((rr3,idx3) => {
+                            if (idx2 == (_this.uploadFiles2.length - 1)) {
+                              if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                                _this.uploadFiles3.map((rr3, idx3) => {
                                   let params3 = new FormData();
                                   params3.append("tableId", response.data.id);
                                   params3.append("tableName", "t_yinnong_transfer");
@@ -1304,44 +1364,44 @@
                                   params3.append("fileType", "3");
                                   params3.append("file", rr3);
                                   commonAttach(params3).then((r3) => {
-                                    if(idx3 == (_this.uploadFiles3.length-1)){
-                                      if(_this.form.capitalExpenditureType==2){
+                                    if (idx3 == (_this.uploadFiles3.length - 1)) {
+                                      if (_this.form.capitalExpenditureType == 2) {
                                         addProjectto(_this.projectForm).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
+                                          _this.chargeItme.map((resD, b) => {
                                             resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
+                                            addCashdetail(resD).then((a, rD) => {
+                                              if (b == (_this.chargeItme.length - 1)) {
                                                 _this.$toast.success('保存成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
+                                                setTimeout(function () {
+                                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                                }, 2000)
                                               }
                                             })
                                           })
                                         })
-                                      } else if(_this.form.capitalExpenditureType==4){
+                                      } else if (_this.form.capitalExpenditureType == 4) {
                                         addInfoto(_this.infoForm).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
+                                          _this.chargeItme.map((resD, b) => {
                                             resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
+                                            addCashdetail(resD).then((a, rD) => {
+                                              if (b == (_this.chargeItme.length - 1)) {
                                                 _this.$toast.success('保存成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
+                                                setTimeout(function () {
+                                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                                }, 2000)
                                               }
                                             })
                                           })
                                         })
-                                      }else{
-                                        _this.chargeItme.map((resD,b) => {
+                                      } else {
+                                        _this.chargeItme.map((resD, b) => {
                                           resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
+                                          addCashdetail(resD).then((a, rD) => {
+                                            if (b == (_this.chargeItme.length - 1)) {
                                               _this.$toast.success('保存成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
+                                              setTimeout(function () {
+                                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                                              }, 2000)
                                             }
                                           })
                                         })
@@ -1349,44 +1409,44 @@
                                     }
                                   })
                                 })
-                              }else{
-                                if(_this.form.capitalExpenditureType==2){
+                              } else {
+                                if (_this.form.capitalExpenditureType == 2) {
                                   addProjectto(_this.projectForm).then(res => {
-                                    _this.chargeItme.map((resD,b) => {
+                                    _this.chargeItme.map((resD, b) => {
                                       resD.cashId = response.data.id
-                                      addCashdetail(resD).then((a,rD) => {
-                                        if(b ==  (_this.chargeItme.length-1)){
+                                      addCashdetail(resD).then((a, rD) => {
+                                        if (b == (_this.chargeItme.length - 1)) {
                                           _this.$toast.success('保存成功');
-                                          setTimeout(function(){
-                                            history.go(-1)
-                                          },2000)
+                                          setTimeout(function () {
+                                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                                          }, 2000)
                                         }
                                       })
                                     })
                                   })
-                                } else if(_this.form.capitalExpenditureType==4){
+                                } else if (_this.form.capitalExpenditureType == 4) {
                                   addInfoto(_this.infoForm).then(res => {
-                                    _this.chargeItme.map((resD,b) => {
+                                    _this.chargeItme.map((resD, b) => {
                                       resD.cashId = response.data.id
-                                      addCashdetail(resD).then((a,rD) => {
-                                        if(b ==  (_this.chargeItme.length-1)){
+                                      addCashdetail(resD).then((a, rD) => {
+                                        if (b == (_this.chargeItme.length - 1)) {
                                           _this.$toast.success('保存成功');
-                                          setTimeout(function(){
-                                            history.go(-1)
-                                          },2000)
+                                          setTimeout(function () {
+                                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                                          }, 2000)
                                         }
                                       })
                                     })
                                   })
-                                }else{
-                                  _this.chargeItme.map((resD,b) => {
+                                } else {
+                                  _this.chargeItme.map((resD, b) => {
                                     resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
+                                    addCashdetail(resD).then((a, rD) => {
+                                      if (b == (_this.chargeItme.length - 1)) {
                                         _this.$toast.success('保存成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
+                                        setTimeout(function () {
+                                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                                        }, 2000)
                                       }
                                     })
                                   })
@@ -1395,8 +1455,8 @@
                             }
                           })
                         })
-                      }else if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                        _this.uploadFiles3.map((rr3,idx3) => {
+                      } else if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                        _this.uploadFiles3.map((rr3, idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", response.data.id);
                           params3.append("tableName", "t_yinnong_transfer");
@@ -1404,44 +1464,44 @@
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
                           commonAttach(params3).then((r3) => {
-                            if(idx3 ==(_this.uploadFiles3.length-1)){
-                              if(_this.form.capitalExpenditureType==2){
+                            if (idx3 == (_this.uploadFiles3.length - 1)) {
+                              if (_this.form.capitalExpenditureType == 2) {
                                 addProjectto(_this.projectForm).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
+                                  _this.chargeItme.map((resD, b) => {
                                     resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
+                                    addCashdetail(resD).then((a, rD) => {
+                                      if (b == (_this.chargeItme.length - 1)) {
                                         _this.$toast.success('保存成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
+                                        setTimeout(function () {
+                                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                                        }, 2000)
                                       }
                                     })
                                   })
                                 })
-                              } else if(_this.form.capitalExpenditureType==4){
+                              } else if (_this.form.capitalExpenditureType == 4) {
                                 addInfoto(_this.infoForm).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
+                                  _this.chargeItme.map((resD, b) => {
                                     resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
+                                    addCashdetail(resD).then((a, rD) => {
+                                      if (b == (_this.chargeItme.length - 1)) {
                                         _this.$toast.success('保存成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
+                                        setTimeout(function () {
+                                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                                        }, 2000)
                                       }
                                     })
                                   })
                                 })
-                              }else{
-                                _this.chargeItme.map((resD,b) => {
+                              } else {
+                                _this.chargeItme.map((resD, b) => {
                                   resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
                                       _this.$toast.success('保存成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
                                     }
                                   })
                                 })
@@ -1449,44 +1509,44 @@
                             }
                           })
                         })
-                      }else{
-                        if(_this.form.capitalExpenditureType==2){
+                      } else {
+                        if (_this.form.capitalExpenditureType == 2) {
                           addProjectto(_this.projectForm).then(res => {
-                            _this.chargeItme.map((resD,b) => {
+                            _this.chargeItme.map((resD, b) => {
                               resD.cashId = response.data.id
-                              addCashdetail(resD).then((a,rD) => {
-                                if(b ==  (_this.chargeItme.length-1)){
+                              addCashdetail(resD).then((a, rD) => {
+                                if (b == (_this.chargeItme.length - 1)) {
                                   _this.$toast.success('保存成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
+                                  setTimeout(function () {
+                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                  }, 2000)
                                 }
                               })
                             })
                           })
-                        } else if(_this.form.capitalExpenditureType==4){
+                        } else if (_this.form.capitalExpenditureType == 4) {
                           addInfoto(_this.infoForm).then(res => {
-                            _this.chargeItme.map((resD,b) => {
+                            _this.chargeItme.map((resD, b) => {
                               resD.cashId = response.data.id
-                              addCashdetail(resD).then((a,rD) => {
-                                if(b ==  (_this.chargeItme.length-1)){
+                              addCashdetail(resD).then((a, rD) => {
+                                if (b == (_this.chargeItme.length - 1)) {
                                   _this.$toast.success('保存成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
+                                  setTimeout(function () {
+                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                  }, 2000)
                                 }
                               })
                             })
                           })
-                        }else{
-                          _this.chargeItme.map((resD,b) => {
+                        } else {
+                          _this.chargeItme.map((resD, b) => {
                             resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
+                            addCashdetail(resD).then((a, rD) => {
+                              if (b == (_this.chargeItme.length - 1)) {
                                 _this.$toast.success('保存成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
                               }
                             })
                           })
@@ -1495,8 +1555,8 @@
                     }
                   })
                 })
-              }else if(this.uploadFiles2!=null&&this.uploadFiles2.length>0){
-                this.uploadFiles2.map((rr2,idx2) => {
+              } else if (this.uploadFiles2 != null && this.uploadFiles2.length > 0) {
+                this.uploadFiles2.map((rr2, idx2) => {
                   let params = new FormData();
                   params.append("tableId", response.data.id);
                   params.append("tableName", "t_yinnong_transfer");
@@ -1504,9 +1564,9 @@
                   params.append("fileType", "2");
                   params.append("file", rr2);
                   commonAttach(params).then((r2) => {
-                    if(idx2 == (_this.uploadFiles2.length-1)){
-                      if(_this.uploadFiles3!=null&&_this.uploadFiles3.length>0){
-                        _this.uploadFiles3.map((rr3,idx3) => {
+                    if (idx2 == (_this.uploadFiles2.length - 1)) {
+                      if (_this.uploadFiles3 != null && _this.uploadFiles3.length > 0) {
+                        _this.uploadFiles3.map((rr3, idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", response.data.id);
                           params3.append("tableName", "t_yinnong_transfer");
@@ -1514,44 +1574,44 @@
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
                           commonAttach(params).then((r3) => {
-                            if(idx3 == (_this.uploadFiles3.length-1)){
-                              if(_this.form.capitalExpenditureType==2){
+                            if (idx3 == (_this.uploadFiles3.length - 1)) {
+                              if (_this.form.capitalExpenditureType == 2) {
                                 addProjectto(_this.projectForm).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
+                                  _this.chargeItme.map((resD, b) => {
                                     resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
+                                    addCashdetail(resD).then((a, rD) => {
+                                      if (b == (_this.chargeItme.length - 1)) {
                                         _this.$toast.success('保存成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
+                                        setTimeout(function () {
+                                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                                        }, 2000)
                                       }
                                     })
                                   })
                                 })
-                              } else if(_this.form.capitalExpenditureType==4){
+                              } else if (_this.form.capitalExpenditureType == 4) {
                                 addInfoto(_this.infoForm).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
+                                  _this.chargeItme.map((resD, b) => {
                                     resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
+                                    addCashdetail(resD).then((a, rD) => {
+                                      if (b == (_this.chargeItme.length - 1)) {
                                         _this.$toast.success('保存成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
+                                        setTimeout(function () {
+                                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                                        }, 2000)
                                       }
                                     })
                                   })
                                 })
-                              }else{
-                                _this.chargeItme.map((resD,b) => {
+                              } else {
+                                _this.chargeItme.map((resD, b) => {
                                   resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
+                                  addCashdetail(resD).then((a, rD) => {
+                                    if (b == (_this.chargeItme.length - 1)) {
                                       _this.$toast.success('保存成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
+                                      setTimeout(function () {
+                                        _this.$router.push({name: 'sunVillageApprovalList11'});
+                                      }, 2000)
                                     }
                                   })
                                 })
@@ -1559,44 +1619,44 @@
                             }
                           })
                         })
-                      }else{
-                        if(_this.form.capitalExpenditureType==2){
+                      } else {
+                        if (_this.form.capitalExpenditureType == 2) {
                           addProjectto(_this.projectForm).then(res => {
-                            _this.chargeItme.map((resD,b) => {
+                            _this.chargeItme.map((resD, b) => {
                               resD.cashId = response.data.id
-                              addCashdetail(resD).then((a,rD) => {
-                                if(b ==  (_this.chargeItme.length-1)){
+                              addCashdetail(resD).then((a, rD) => {
+                                if (b == (_this.chargeItme.length - 1)) {
                                   _this.$toast.success('保存成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
+                                  setTimeout(function () {
+                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                  }, 2000)
                                 }
                               })
                             })
                           })
-                        } else if(_this.form.capitalExpenditureType==4){
+                        } else if (_this.form.capitalExpenditureType == 4) {
                           addInfoto(_this.infoForm).then(res => {
-                            _this.chargeItme.map((resD,b) => {
+                            _this.chargeItme.map((resD, b) => {
                               resD.cashId = response.data.id
-                              addCashdetail(resD).then((a,rD) => {
-                                if(b ==  (_this.chargeItme.length-1)){
+                              addCashdetail(resD).then((a, rD) => {
+                                if (b == (_this.chargeItme.length - 1)) {
                                   _this.$toast.success('保存成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
+                                  setTimeout(function () {
+                                    _this.$router.push({name: 'sunVillageApprovalList11'});
+                                  }, 2000)
                                 }
                               })
                             })
                           })
-                        }else{
-                          _this.chargeItme.map((resD,b) => {
+                        } else {
+                          _this.chargeItme.map((resD, b) => {
                             resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
+                            addCashdetail(resD).then((a, rD) => {
+                              if (b == (_this.chargeItme.length - 1)) {
                                 _this.$toast.success('保存成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
                               }
                             })
                           })
@@ -1605,8 +1665,8 @@
                     }
                   })
                 })
-              }else if(this.uploadFiles3!=null&&this.uploadFiles3.length>0){
-                this.uploadFiles3.map((rr3,idx3) => {
+              } else if (this.uploadFiles3 != null && this.uploadFiles3.length > 0) {
+                this.uploadFiles3.map((rr3, idx3) => {
                   let params = new FormData();
                   params.append("tableId", response.data.id);
                   params.append("tableName", "t_yinnong_transfer");
@@ -1614,44 +1674,44 @@
                   params.append("fileType", "3");
                   params.append("file", rr3);
                   commonAttach(params).then((r) => {
-                    if(idx3 == (_this.uploadFiles3.length-1)){
-                      if(_this.form.capitalExpenditureType==2){
+                    if (idx3 == (_this.uploadFiles3.length - 1)) {
+                      if (_this.form.capitalExpenditureType == 2) {
                         addProjectto(_this.projectForm).then(res => {
-                          _this.chargeItme.map((resD,b) => {
+                          _this.chargeItme.map((resD, b) => {
                             resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
+                            addCashdetail(resD).then((a, rD) => {
+                              if (b == (_this.chargeItme.length - 1)) {
                                 _this.$toast.success('保存成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
                               }
                             })
                           })
                         })
-                      } else if(_this.form.capitalExpenditureType==4){
+                      } else if (_this.form.capitalExpenditureType == 4) {
                         addInfoto(_this.infoForm).then(res => {
-                          _this.chargeItme.map((resD,b) => {
+                          _this.chargeItme.map((resD, b) => {
                             resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
+                            addCashdetail(resD).then((a, rD) => {
+                              if (b == (_this.chargeItme.length - 1)) {
                                 _this.$toast.success('保存成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
+                                setTimeout(function () {
+                                  _this.$router.push({name: 'sunVillageApprovalList11'});
+                                }, 2000)
                               }
                             })
                           })
                         })
-                      }else{
-                        _this.chargeItme.map((resD,b) => {
+                      } else {
+                        _this.chargeItme.map((resD, b) => {
                           resD.cashId = response.data.id
-                          addCashdetail(resD).then((a,rD) => {
-                            if(b ==  (_this.chargeItme.length-1)){
+                          addCashdetail(resD).then((a, rD) => {
+                            if (b == (_this.chargeItme.length - 1)) {
                               _this.$toast.success('保存成功');
-                              setTimeout(function(){
-                                history.go(-1)
-                              },2000)
+                              setTimeout(function () {
+                                _this.$router.push({name: 'sunVillageApprovalList11'});
+                              }, 2000)
                             }
                           })
                         })
@@ -1659,44 +1719,44 @@
                     }
                   })
                 })
-              }else{
-                if(this.form.capitalExpenditureType==2){
+              } else {
+                if (this.form.capitalExpenditureType == 2) {
                   addProjectto(this.projectForm).then(res => {
-                    _this.chargeItme.map((resD,b) => {
+                    _this.chargeItme.map((resD, b) => {
                       resD.cashId = response.data.id
-                      addCashdetail(resD).then((a,rD) => {
-                        if(b ==  (_this.chargeItme.length-1)){
+                      addCashdetail(resD).then((a, rD) => {
+                        if (b == (_this.chargeItme.length - 1)) {
                           _this.$toast.success('保存成功');
-                          setTimeout(function(){
-                            history.go(-1)
-                          },2000)
+                          setTimeout(function () {
+                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                          }, 2000)
                         }
                       })
                     })
                   })
-                } else if(this.form.capitalExpenditureType==4){
+                } else if (this.form.capitalExpenditureType == 4) {
                   addInfoto(this.infoForm).then(res => {
-                    _this.chargeItme.map((resD,b) => {
+                    _this.chargeItme.map((resD, b) => {
                       resD.cashId = response.data.id
-                      addCashdetail(resD).then((a,rD) => {
-                        if(b ==  (_this.chargeItme.length-1)){
+                      addCashdetail(resD).then((a, rD) => {
+                        if (b == (_this.chargeItme.length - 1)) {
                           _this.$toast.success('保存成功');
-                          setTimeout(function(){
-                            history.go(-1)
-                          },2000)
+                          setTimeout(function () {
+                            _this.$router.push({name: 'sunVillageApprovalList11'});
+                          }, 2000)
                         }
                       })
                     })
                   })
-                }else{
-                  _this.chargeItme.map((resD,b) => {
+                } else {
+                  _this.chargeItme.map((resD, b) => {
                     resD.cashId = response.data.id
-                    addCashdetail(resD).then((a,rD) => {
-                      if(b ==  (_this.chargeItme.length-1)){
+                    addCashdetail(resD).then((a, rD) => {
+                      if (b == (_this.chargeItme.length - 1)) {
                         _this.$toast.success('保存成功');
-                        setTimeout(function(){
-                          history.go(-1)
-                        },2000)
+                        setTimeout(function () {
+                          _this.$router.push({name: 'sunVillageApprovalList11'});
+                        }, 2000)
                       }
                     })
                   })
@@ -1711,43 +1771,43 @@
         let fuzhitype = 0;
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
-          return account.id === select ; //筛选出匹配数据
+          return account.id === select; //筛选出匹配数据
         });
-        if(this.chargeItme != [] && this.chargeItme.length>1){
+        if (this.chargeItme != [] && this.chargeItme.length > 1) {
           this.chargeItme.some((value, index) => {
-            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+            if (value.payeeAccount != undefined && value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount && index != i) {
               fuzhitype = 2;
               return true;
             }
-            if(value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+            if (value.accountType != undefined && value.accountType != '' && obj.accountType != value.accountType && index != i) {
               fuzhitype = 1;
               return true;
             }
           });
         }
-        if(fuzhitype == 0){
-          this.$set(this.chargeItme[i], "payee",obj.payee)
+        if (fuzhitype == 0) {
+          this.$set(this.chargeItme[i], "payee", obj.payee)
           this.$set(this.chargeItme[i], "bankType", obj.bankType)
           this.$set(this.chargeItme[i], "payeeId", obj.id);
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-        }else if(fuzhitype == 1){
-          this.$set(this.chargeItme[i], "payee",'')
-          this.$set(this.chargeItme[i], "bankType",'')
+        } else if (fuzhitype == 1) {
+          this.$set(this.chargeItme[i], "payee", '')
+          this.$set(this.chargeItme[i], "bankType", '')
           this.$set(this.chargeItme[i], "payeeId", '');
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
-        }else if(fuzhitype == 2){
-          this.$set(this.chargeItme[i], "payee",'')
-          this.$set(this.chargeItme[i], "bankType",'')
+          this.$notify({type: 'danger', message: '请选择账户类型相同的收款方！'});
+        } else if (fuzhitype == 2) {
+          this.$set(this.chargeItme[i], "payee", '')
+          this.$set(this.chargeItme[i], "bankType", '')
           this.$set(this.chargeItme[i], "payeeId", '');
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$notify({ type: 'danger', message: '收款方已存在！' });
+          this.$notify({type: 'danger', message: '收款方已存在！'});
         }
       },
       selectChange(select) {
@@ -1756,11 +1816,11 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountType == "101"){
+        if (obj.accountType == "101") {
           obj.accountPassword = "";
         }
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "") {
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -1776,85 +1836,220 @@
           this.$set(this.form, "cifNo", obj.cifNo);
           this.$set(this.form, "balance", obj.balance);
           this.$set(this.form, "payerFrom", '1');
-          if(obj.bankType==1){
+          if (obj.bankType == 1) {
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();
-          }else if(obj.bankType==2||obj.bankType==4){
+          } else if (obj.bankType == 2 || obj.bankType == 4) {
             this.form.accountType = null
             this.form.isPeers = "Y"
             this.accountTypeChange1();
           }
-        }else{
-          if(obj.payerFrom==1){
+        } else {
+          if (obj.payerFrom == 1) {
             this.diglogStatus = false;
-            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
-            this.$set(this.form,"payer","")
-            this.$set(this.form,"payerAccount","")
-          }else{
+            this.$notify({type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！"});
+            this.$set(this.form, "payer", "")
+            this.$set(this.form, "payerAccount", "")
+          } else {
             this.$set(this.form, "payerFrom", obj.parerFrom);
-            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+            if (obj.operatorCode != null && obj.operatorCode != '') {
               this.$set(this.form, "operatorCode", obj.operatorCode);
-            }else{
+            } else {
               this.$set(this.form, "operatorCode", '');
             }
-            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+            if (obj.enterpriseCode != null && obj.enterpriseCode != '') {
               this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-            }else{
+            } else {
               this.$set(this.form, "enterpriseCode", '');
             }
-            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+            if (obj.accountPassword != null && obj.accountPassword != '') {
               this.$set(this.form, "accountPassword", obj.accountPassword);
-            }else{
+            } else {
               this.$set(this.form, "accountPassword", '');
             }
-            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "bookId", '');
             this.$set(this.form, "deptId", '');
             this.$set(this.form, "cashierId", obj.id);
             this.$set(this.form, "payer", obj.accountName);
             this.$set(this.form, "bankType", obj.bankType);
-            if(obj.payerFrom==6){
+            if (obj.payerFrom == 6) {
               getQmyeFlow(obj.id).then((response) => {
                 this.$set(this.form, "payerAccount", response.data);
               });
-            }else {
+            } else {
               this.$set(this.form, "payerAccount", obj.bankAccountNumber);
             }
           }
         }
       },
       beforeRead1(file) {
-        this.uploadFiles1.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList1.splice(-1, 1);
+          this.fileList1.push(file);
+          this.uploadFiles1.push(file.file);
+        }
       },
-      deleteFile1(file){
-        this.uploadFiles1.map((response,index) => {
-          if(file.file == response){
-            this.uploadFiles1.splice(index,1)
+      deleteFile1(file) {
+        this.uploadFiles1.map((response, index) => {
+          if (file.file == response) {
+            this.uploadFiles1.splice(index, 1)
           }
         })
       },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      fileToBase64(file, fileType) {
+        return new Promise((resolve, reject) => {
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload = function () {
+            const base64String = reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,' + base64String);
+          }
+          reader.onerror = function () {
+            reject(new Error("Failed to load file"))
+          }
+        })
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
       beforeRead2(file) {
-        this.uploadFiles2.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList2.splice(-1, 1);
+          this.fileList2.push(file);
+          this.uploadFiles2.push(file.file);
+        }
       },
-      deleteFile2(file){
-        this.uploadFiles2.map((response,index) => {
-          if(file.file == response){
-            this.uploadFiles2.splice(index,1)
+      deleteFile2(file) {
+        this.uploadFiles2.map((response, index) => {
+          if (file.file == response) {
+            this.uploadFiles2.splice(index, 1)
           }
         })
       },
       beforeRead3(file) {
-        this.uploadFiles3.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList3.splice(-1, 1);
+          this.fileList3.push(file);
+          this.uploadFiles3.push(file.file);
+        }
       },
-      deleteFile3(file){
-        this.uploadFiles3.map((response,index) => {
-          if(file.file == response){
-            this.uploadFiles3.splice(index,1)
+      deleteFile3(file) {
+        this.uploadFiles3.map((response, index) => {
+          if (file.file == response) {
+            this.uploadFiles3.splice(index, 1)
           }
         })
       },
-      getFileList(){
-        let oData1= {
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          console.info(file)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getFileList() {
+        let oData1 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
@@ -1862,11 +2057,13 @@
         }
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
-        let oData2= {
+        let oData2 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
@@ -1874,11 +2071,13 @@
         }
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
-        let oData3= {
+        let oData3 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
@@ -1886,17 +2085,19 @@
         }
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
-      goBack(){
+      goBack() {
         window.history.go(-1)
       },
       //删除家庭成员
-      deleteChargeItme(index){
-        this.chargeItme.splice(index,1)
+      deleteChargeItme(index) {
+        this.chargeItme.splice(index, 1)
       },
     },
   }
@@ -1905,66 +2106,73 @@
 <style scoped lang="scss">
   .app-container {
     padding-bottom: 2%;
-    .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: 20PX;
-        height: 20PX;
-        background: url('../../../../../static/images/icon/icon_flow.png') center center no-repeat;
-        background-size: 20PX 20PX;
-        position: absolute;
-        right: 38px;
-        top: 36px;
-      }
-    }
+
+  .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: 20PX;
+    height: 20PX;
+    background: url('../../../../../static/images/icon/icon_flow.png') center center no-repeat;
+    background-size: 20PX 20PX;
+    position: absolute;
+    right: 38px;
+    top: 36px;
+  }
+
+  }
   }
-  .main_title{
+  .main_title {
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
     position: relative;
   }
-  .main_box{
+
+  .main_box {
     width: 96%;
     margin: 0 auto;
     border-radius: 6px;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
     overflow: hidden;
     background-color: #FFF;
   }
-  .submitButton{
+
+  .submitButton {
     width: 80%;
     margin: 0 auto;
     background-color: #1D6FE9;
   }
 
-  .addFamily{
+  .addFamily {
     position: absolute;
     top: -2px;
     right: 0;
     border-radius: 50%;
   }
-  .deleteFamily{
+
+  .deleteFamily {
     position: absolute;
     top: 0rem;
     right: 6%;
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval11.vue
index 69dbe57d..a7333da6 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval11.vue
@@ -355,7 +355,7 @@
         const data = {
           taskId: this.$route.query.taskId,
           auditbatchNo: this.$route.query.auditbatchNo,
-          comment: this.comment,
+          remark: this.comment,
           pass: this.pass,
           };
         approval(data).then((response) => {
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
index 43ccf8c4..0a72bc04 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -83,13 +83,43 @@
     <div class="main_box" style="padding: 5px 0 0 0;">
       <van-cell value="收据" />
       <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" @click-preview="previewPreview" :max-count="fileList1.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="发票" />
       <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" @click-preview="previewPreview" :max-count="fileList2.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="其他" />
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" @click-preview="previewPreview" :max-count="fileList3.length" style="margin-left:8px;" >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
   </div>
 </template>
@@ -210,6 +240,120 @@
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {
           getCashierAccount(response.data.cashierId).then(res => {
@@ -278,7 +422,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -290,7 +436,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -302,7 +450,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
index b32e2616..c52f9135 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -72,13 +72,43 @@
     <div class="main_box" style="padding: 5px 0 0 0;">
       <van-cell value="收据" />
       <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false"  @click-preview="previewPreview" :max-count="fileList1.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="发票" />
       <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false"  @click-preview="previewPreview"  :max-count="fileList2.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="其他" />
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false"  @click-preview="previewPreview" :max-count="fileList3.length" style="margin-left:8px;" >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
   </div>
 </template>
@@ -253,6 +283,120 @@
           }
         });
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
@@ -263,7 +407,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -275,7 +421,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -287,7 +435,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
index 2ef41755..5388c46e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
@@ -27,7 +27,7 @@
         finished-text="没有更多了"
         @load="getList">
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" center :to="{name:'sunVillageApprovalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
+          <van-cell :title="item.remark" center :to="{name:'sunVillageApprovalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn1.png" size="30" color="#FF4646" style="margin-right: 10px;" />
             </template>
@@ -35,22 +35,25 @@
               <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 30px;"></i>{{item.applyDate}}</p>
             </template>
             <template #default>
-              <p style="width: 80px;display: inline-block">{{item.auditStatus}}</p>
+              <span v-if="item.auditStatus === '0'" style="color: #696969">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+              <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+              <span v-else-if="item.auditStatus === '3' " style="color: #00FF00">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+              <span  v-else style="color: #FFA500;">{{ selectDictLabel(auditStatusOptions, item.auditStatus) }} </span>
             </template>
           </van-cell>
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'sunVillageApprovalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="修改" type="info" :to="{name:'sunVillageApprovalModify', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='待审'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='1'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -106,7 +109,9 @@ export default {
         listTransfer(this.queryParams).then(response => {
           console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatusOptions, response.rows[i].auditStatus);
+            if(response.rows[i].remark.length > 12){
+              response.rows[i].remark = response.rows[i].remark.substring(0,12)+"...";
+            }
             this.applicationList.push(response.rows[i]);
           }
           console.log(this.applicationList.length >= response.total)
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList11.vue
index 831457f3..511e60f1 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList11.vue
@@ -28,10 +28,14 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'sunVillageApprovalDetail11', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
+          <van-cell :title="item.remark" center :to="{name:'sunVillageApprovalDetail11', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn7.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
+            <span v-if="item.auditStatus === '0'" style="color: #696969">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+            <span v-else-if="item.auditStatus === '3' " style="color: #00FF00">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+            <span  v-else style="color: #FFA500;">{{ selectDictLabel(auditStatusOptions, item.auditStatus) }} </span>
             <template #label>
               <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
             </template>
@@ -39,16 +43,16 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'sunVillageApprovalModify11', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="修改" type="info" :to="{name:'sunVillageApprovalModify11', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='待审'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='1'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -101,7 +105,9 @@ export default {
         listCash(this.queryParams).then(response => {
           console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatusOptions, response.rows[i].auditStatus);
+            if(response.rows[i].remark.length > 12){
+              response.rows[i].remark = response.rows[i].remark.substring(0,12)+"...";
+            }
             this.applicationList.push(response.rows[i]);
           }
           console.log(this.applicationList.length >= response.total)
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index b4093672..bc812743 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -323,11 +323,41 @@
       <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" @click-preview="previewPreview" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -813,6 +843,120 @@
           this.saveRelease()
         }
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       saveRelease(){
         let _this = this;
         this.$set(this.form, "payeeList", this.chargeItme);
@@ -1051,6 +1195,20 @@
           commonAttach(params1).then((r1) => {
             file.id=r1.id;
             file.fileUrl = r1.fileUrl;
+            let subIndex = r1.fileUrl.lastIndexOf(".");
+            let ext =  r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length);
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+            let fileData =  {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext};
+            if(obj === '1'){
+              this.fileList1.splice(-1, 1);
+              this.fileList1.push(fileData);
+            }else if(obj === '2'){
+              this.fileList2.splice(-1, 1);
+              this.fileList2.push(fileData);
+            }else{
+              this.fileList3.splice(-1, 1);
+              this.fileList3.push(fileData);
+            }
           })
         }
       },
@@ -1068,7 +1226,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -1080,7 +1240,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -1092,7 +1254,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify11.vue
index c52a2603..eb1039b9 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -234,11 +234,41 @@
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead1" @delete="deleteFile1" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead1"  @click-preview="previewPreview" @delete="deleteFile1" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead2" @delete="deleteFile2" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead2" @click-preview="previewPreview" @delete="deleteFile2" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead3" @delete="deleteFile3" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead3" @click-preview="previewPreview" @delete="deleteFile3" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -395,6 +425,120 @@
           }
         })
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       initProjectInfo(){
         let _this = this
         let queryParams={
@@ -1807,7 +1951,14 @@
         }
       },
       beforeRead1(file) {
-        this.uploadFiles1.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList1.splice(-1, 1);
+          this.fileList1.push(file);
+          this.uploadFiles1.push(file.file);
+        }
       },
       deleteFile1(file){
         this.uploadFiles1.map((response,index) => {
@@ -1821,7 +1972,14 @@
         }
       },
       beforeRead2(file) {
-        this.uploadFiles2.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList2.splice(-1, 1);
+          this.fileList2.push(file);
+          this.uploadFiles2.push(file.file);
+        }
       },
       deleteFile2(file){
         this.uploadFiles2.map((response,index) => {
@@ -1835,7 +1993,14 @@
         }
       },
       beforeRead3(file) {
-        this.uploadFiles3.push(file.file);
+        let subIndex = file.file.name.lastIndexOf(".");
+        let ext =  file.file.name.substring(subIndex + 1, file.file.name.length);
+        if(ext !== 'png' || ext !== 'jpg'){
+          this.$set(file, "type", ext);
+          this.fileList3.splice(-1, 1);
+          this.fileList3.push(file);
+          this.uploadFiles3.push(file.file);
+        }
       },
       deleteFile3(file){
         this.uploadFiles3.map((response,index) => {
@@ -1858,7 +2023,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -1870,7 +2037,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -1882,7 +2051,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/sunVillage_info/informationFunPlanAdd.vue b/src/views/sunVillage_info/informationFunPlanAdd.vue
index 6e8faac6..0df0e2cf 100644
--- a/src/views/sunVillage_info/informationFunPlanAdd.vue
+++ b/src/views/sunVillage_info/informationFunPlanAdd.vue
@@ -24,12 +24,12 @@
             @cancel="showCollectionPay = false"/>
         </van-popup>
 
-        <van-field v-model="form.orderNum" label="结款序号" placeholder="结款序号" required input-align="right" type="digit"   :error-message="errorMessages.orderNum" :border="false" />
+        <van-field v-model="form.orderNum" label="结款序号" placeholder="填写序号" required input-align="right" type="digit"   :error-message="errorMessages.orderNum" :border="false" />
         <van-field v-model="form.settlementDate" clickable label="结款日期" placeholder="请选择" :error-message="errorMessages.settlementDate" @click="showSettlementDate = true" input-align="right" right-icon="arrow-down" label-width="auto" required :border="false"/>
         <van-popup v-model="showSettlementDate" position="bottom">
           <van-datetime-picker v-model="settlementDate" type="date" title="选择年月日" @confirm="onConfirmSettlementDate" @cancel="showSettlementDate = false"/>
         </van-popup>
-        <van-field v-model="form.settlementAmount" label="结款金额" type="number" required placeholder="结款金额" input-align="right" :error-message="errorMessages.settlementAmount" :border="false"  />
+        <van-field v-model="form.settlementAmount" label="结款金额" type="number" required placeholder="填写金额" input-align="right" :error-message="errorMessages.settlementAmount" :border="false"  />
 
         <van-field v-model="planStatus" @click="showPlanStatus = false" label="结款状态"  input-align="right" :border="false" disabled  />
         <van-popup v-model="showPlanStatus"  position="bottom">
@@ -41,7 +41,7 @@
             disabled/>
         </van-popup>
 
-        <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
+        <van-field v-model="form.remark" label="备注" placeholder="填写备注" input-align="right" :border="false" />
       </div>
       <div style="margin: 16px auto;width: 50%;">
         <van-button round block type="primary" native-type="submit">
diff --git a/src/views/sunVillage_info/list_contract.vue b/src/views/sunVillage_info/list_contract.vue
index cad78de0..bb8862e2 100644
--- a/src/views/sunVillage_info/list_contract.vue
+++ b/src/views/sunVillage_info/list_contract.vue
@@ -4,7 +4,7 @@
       class="header_main"
       :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
-      {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':queryParams.otherType=='4'?'产交':''}}公开
+      {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':queryParams.otherType=='4'?'产交':queryParams.otherType=='5'?'惠农资金':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn" @click="goAdd" v-show="showBtn"></div>
     </div>
@@ -107,7 +107,7 @@
       if (this.$route.query.type == 'code'){
         this.showBtn = false;
       }
-      document.title = this.$route.query.typeX=='1'?'合同公开':this.$route.query.typeX=='2'?'党务公开':this.$route.query.typeX=='3'?'政务公开':this.$route.query.typeX=='4'?'产交公开':'';
+      document.title = this.$route.query.typeX=='1'?'合同公开':this.$route.query.typeX=='2'?'党务公开':this.$route.query.typeX=='3'?'政务公开':this.$route.query.typeX=='4'?'产交公开':this.$route.query.typeX=='5'?'惠农资金公开':'';
     },
     methods: {
       getList(){
diff --git a/src/views/sunVillage_info/list_contract_detail.vue b/src/views/sunVillage_info/list_contract_detail.vue
index c65cfad8..7a00e0ef 100644
--- a/src/views/sunVillage_info/list_contract_detail.vue
+++ b/src/views/sunVillage_info/list_contract_detail.vue
@@ -89,7 +89,8 @@
             <div v-for="(item,index) in openFile" :key="index" style="display: flex;align-items: center;margin-top: 10px;">
               <img src="../../assets/images/sunVillage_info/WORD.png" width="30" v-if="item.type == 'word'"/>
               <img src="../../assets/images/sunVillage_info/ECEL.png" width="30" v-if="item.type == 'excel'" />
-              <a :href="item.url" style="margin-left: 10px;color: #333333">{{item.name}}</a>
+              <a v-if="item.type == 'word' || item.type == 'excel'" :href="item.url"  style="margin-left: 10px;color: #333333">{{item.name}}</a>
+              <p v-else @click="goToPage(item.url)" style="margin-left: 10px;color: #333333">{{item.name}}</p>
             </div>
           </div>
 <!--          <van-uploader accept="*" :after-read="afterReadOpenFile" style="margin-top: 10PX">-->
@@ -115,6 +116,12 @@
 
       </div>
     </van-form>
+    <van-dialog v-model:show="fjImgShow" title="附件" :show-confirm-button="false" show-cancel-button  cancelButtonText="关闭" >
+      <div style="width: 100%;height: 400px;overflow:scroll;">
+        <img :src="fjImg" width="95%"/>
+      </div>
+
+    </van-dialog>
   </div>
 </template>
 
@@ -128,6 +135,8 @@
       return {
         showBuildTime:false,
         showPictureType:false,
+        fjImg:"",
+        fjImgShow:false,
         form:{
           openAt:this.format(new Date(),'yyyy-MM-dd'),
           openPic:'',
@@ -203,6 +212,26 @@
           that.form = res.data;
         })
       },
+      goToPage(url) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        let subIndex = url.lastIndexOf(".");
+        let ext = url.substring(subIndex + 1, url.length);
+        //console.log(ext)
+        if (ext == "jpg" || ext == "png") {
+          url = url.substring(4,url.length);
+          this.fjImg = baseImgUrl + url;
+          this.fjImgShow = true;
+        }else{
+          let allUrl =  url;
+          const link = document.createElement("a");
+          link.style.display = "none";
+          link.target = "_blank"
+          link.href = allUrl;
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        }
+      },
       onSubmit(){
         var that = this;
         that.form.openFile = that.openFile2.join(',')
diff --git a/src/views/sunVillage_info/list_finance_detail.vue b/src/views/sunVillage_info/list_finance_detail.vue
index 378f879b..21572f00 100644
--- a/src/views/sunVillage_info/list_finance_detail.vue
+++ b/src/views/sunVillage_info/list_finance_detail.vue
@@ -54,7 +54,8 @@
                <div v-for="(item,index) in openFileList" :key="index" style="display: flex;align-items: center;margin-top: 10px;">
                  <img src="../../assets/images/sunVillage_info/WORD.png" width="30" v-if="item.type == 'word'"/>
                  <img src="../../assets/images/sunVillage_info/ECEL.png" width="30" v-if="item.type == 'excel'" />
-                 <a :href="item.url" style="margin-left: 10px;color: #333333">{{item.name}}</a>
+                 <a v-if="item.type == 'word' || item.type == 'excel'" :href="item.url"  style="margin-left: 10px;color: #333333">{{item.name}}</a>
+                 <p v-else @click="goToPage(item.url)" style="margin-left: 10px;color: #333333">{{item.name}}</p>
                </div>
              </div>
            </div>
@@ -66,7 +67,11 @@
            </van-field>
 
          </div>
-
+       <van-dialog v-model:show="fjImgShow" title="附件" :show-confirm-button="false" show-cancel-button  cancelButtonText="关闭" >
+         <div style="width: 100%;height: 400px;overflow:scroll;">
+           <img :src="fjImg" width="95%"/>
+         </div>
+       </van-dialog>
     </div>
 </template>
 
@@ -87,6 +92,8 @@
         openPic:[],
         fileList:[],
         fileList1:[],
+        fjImgShow:false,
+        fjImg:'',
         openNy:new Date(),
         type:'',
         openFile:[],
@@ -141,6 +148,26 @@
           this.form = res.data;
         })
       },
+      goToPage(url) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        let subIndex = url.lastIndexOf(".");
+        let ext = url.substring(subIndex + 1, url.length);
+        //console.log(ext)
+        if (ext == "jpg" || ext == "png") {
+          url = url.substring(4,url.length);
+          this.fjImg = baseImgUrl + url;
+          this.fjImgShow = true;
+        }else{
+          let allUrl =  url;
+          const link = document.createElement("a");
+          link.style.display = "none";
+          link.target = "_blank"
+          link.href = allUrl;
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        }
+      },
 
     },
   }
diff --git a/src/views/sunVillage_info/list_photo_detail.vue b/src/views/sunVillage_info/list_photo_detail.vue
index 3d4af313..58e190cb 100644
--- a/src/views/sunVillage_info/list_photo_detail.vue
+++ b/src/views/sunVillage_info/list_photo_detail.vue
@@ -86,7 +86,8 @@
             <div v-for="(item,index) in openFile" :key="index" style="display: flex;align-items: center;margin-top: 10px;">
               <img src="../../assets/images/sunVillage_info/WORD.png" width="30" v-if="item.type == 'word'"/>
               <img src="../../assets/images/sunVillage_info/ECEL.png" width="30" v-if="item.type == 'excel'" />
-              <a :href="item.url" style="margin-left: 10px;color: #333333">{{item.name}}</a>
+              <a v-if="item.type == 'word' || item.type == 'excel'" :href="item.url"  style="margin-left: 10px;color: #333333">{{item.name}}</a>
+              <p v-else @click="goToPage(item.url)" style="margin-left: 10px;color: #333333">{{item.name}}</p>
             </div>
           </div>
 <!--          <van-uploader accept="*" :after-read="afterReadOpenFile" style="margin-top: 10PX">-->
@@ -102,6 +103,11 @@
 
       </div>
     </van-form>
+    <van-dialog v-model:show="fjImgShow" title="附件" :show-confirm-button="false" show-cancel-button  cancelButtonText="关闭" >
+      <div style="width: 100%;height: 400px;overflow:scroll;">
+        <img :src="fjImg" width="95%"/>
+      </div>
+    </van-dialog>
   </div>
 </template>
 
@@ -120,6 +126,8 @@
           openPic:'',
           openFile:'',
         },
+        fjImg:'',
+        fjImgShow:false,
         openPic:[],
         pictureTypeOptions:[],
         fileList:[],
@@ -165,7 +173,7 @@
               }else if(name.indexOf('.xls') > -1){
                 type = 'excel';
               }
-              this.openFile[i] = {name:name,type:type}
+              this.openFile[i] = {name:name,type:type,url:'/api'+rr}
             })
           }
           if (res.data.openPic!='' && res.data.openPic != null && res.data.openPic != undefined){
@@ -192,6 +200,26 @@
           }
         })
       },
+      goToPage(url) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        let subIndex = url.lastIndexOf(".");
+        let ext = url.substring(subIndex + 1, url.length);
+        //console.log(ext)
+        if (ext == "jpg" || ext == "png") {
+          url = url.substring(4,url.length);
+          this.fjImg = baseImgUrl + url;
+          this.fjImgShow = true;
+        }else{
+          let allUrl =  url;
+          const link = document.createElement("a");
+          link.style.display = "none";
+          link.target = "_blank"
+          link.href = allUrl;
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        }
+      },
       onConfirmOpenNy(data){
         this.form.openAt = this.format(data,'yyyy-MM-dd');
         this.openNy = data;
diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue
index 44245df5..ed98aa51 100644
--- a/src/views/sunVillage_info/list_tourists_detail.vue
+++ b/src/views/sunVillage_info/list_tourists_detail.vue
@@ -54,7 +54,8 @@
                <div v-for="(item,index) in openFileList" :key="index" style="display: flex;align-items: center;margin-top: 10px;">
                  <img src="../../assets/images/sunVillage_info/WORD.png" width="30" v-if="item.type == 'word'"/>
                  <img src="../../assets/images/sunVillage_info/ECEL.png" width="30" v-if="item.type == 'excel'" />
-                 <a :href="item.url" style="margin-left: 10px;color: #333333">{{item.name}}</a>
+                 <a v-if="item.type == 'word' || item.type == 'excel'" :href="item.url"  style="margin-left: 10px;color: #333333">{{item.name}}</a>
+                 <p v-else @click="goToPage(item.url)" style="margin-left: 10px;color: #333333">{{item.name}}</p>
                </div>
              </div>
            </div>
@@ -66,7 +67,11 @@
            </van-field>
 
          </div>
-
+       <van-dialog v-model:show="fjImgShow" title="附件" :show-confirm-button="false" show-cancel-button  cancelButtonText="关闭" >
+         <div style="width: 100%;height: 400px;overflow:scroll;">
+           <img :src="fjImg" width="95%"/>
+         </div>
+       </van-dialog>
     </div>
 </template>
 
@@ -84,6 +89,8 @@
           openPic:'',
           openFile:'',
         },
+        fjImg:'',
+        fjImgShow:false,
         openPic:[],
         fileList:[],
         fileList1:[],
@@ -141,7 +148,26 @@
           this.form = res.data;
         })
       },
-
+      goToPage(url) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        let subIndex = url.lastIndexOf(".");
+        let ext = url.substring(subIndex + 1, url.length);
+        //console.log(ext)
+        if (ext == "jpg" || ext == "png") {
+          url = url.substring(4,url.length);
+          this.fjImg = baseImgUrl + url;
+          this.fjImgShow = true;
+        }else{
+          let allUrl =  url;
+          const link = document.createElement("a");
+          link.style.display = "none";
+          link.target = "_blank"
+          link.href = allUrl;
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        }
+      },
     },
   }
 </script>
diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue
index e19014e8..b412e1b3 100644
--- a/src/views/sunVillage_info/list_tourists_registration.vue
+++ b/src/views/sunVillage_info/list_tourists_registration.vue
@@ -29,8 +29,8 @@
           <van-row>
             <van-col :span="24">姓名</van-col>
           </van-row>
-          <van-row v-for="(item,index) in 10" :key="index">
-            <van-col :span="24">张三</van-col>
+          <van-row v-for="(item,index) in oddjobList" :key="index">
+            <van-col :span="24">{{item.workerName}}</van-col>
           </van-row>
           <div class="name_bg"></div>
           <img src="../../assets/images/sunVillage_info/name_icon.png" class="name_icon"/>
@@ -43,10 +43,10 @@
               <van-col :span="8">出工事由</van-col>
               <van-col :span="8">出工数</van-col>
             </van-row>
-            <van-row v-for="(item,index) in 10" :key="index">
-              <van-col :span="8">2023-03-05</van-col>
-              <van-col :span="8">上班打卡</van-col>
-              <van-col :span="8">8</van-col>
+            <van-row v-for="(item,index) in oddjobList" :key="index">
+              <van-col :span="8">{{item.jobTime}}</van-col>
+              <van-col :span="8">{{item.workReason}}</van-col>
+              <van-col :span="8">{{item.workNum}}</van-col>
             </van-row>
           </div>
         </div>
@@ -77,6 +77,7 @@
         fileList:[],
         listLength:'0',
         searchInput:'',
+        pageNum:0,
         queryParams:{
           pageNum:1,
           pageSize:10,
@@ -92,6 +93,7 @@
         showBtn:true,
         yearMonth:[],
         yearList:[],
+        oddjobList:[],
         deptName:'',
         nowYear:new Date().getFullYear(),
       };
@@ -109,7 +111,14 @@
     methods: {
       getList(){
         var _this = this;
-
+        let params = {
+          bookId:this.queryParams.bookId,
+          yearMonth:this.queryParams.yearMonth,
+        }
+        listOddjob(params).then(response => {
+          this.listLength = response.total;
+          this.oddjobList = response.rows;
+        });
       },
       tabClickMonth(month){
         this.month = month ;
diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue
index 0c0f4d36..75368e19 100644
--- a/src/views/sunVillage_info/list_tourists_registration_add.vue
+++ b/src/views/sunVillage_info/list_tourists_registration_add.vue
@@ -4,7 +4,7 @@
              零工登记
              <div class="return_btn" @click="onClickLeft"></div>
          </div>
-       <van-form >
+       <van-form  ref="formData">
          <div class="list_main">
            <div class="titBox">
              <img src="../../assets/images/sunVillage_info/add_icon_3.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
@@ -16,7 +16,7 @@
              clickable
              label="出工日期"
              placeholder="请选择"
-             v-model="value"
+             v-model="form.jobTime"
              @click="showBuildTime = true"
              input-align="right"
              right-icon="arrow-down"
@@ -30,24 +30,25 @@
                type="date"
                title="选择年月日"
                :min-date="minDate"
-               v-model="buildTime"
+               :max-date="maxDate"
+               :value="new Date"
                @confirm="onConfirmBuildTime"
                @cancel="showBuildTime = false"
              />
            </van-popup>
 
-           <van-field required :rules="[{ required: true, message: '请填写出工姓名' }]" v-model="value" label="出工姓名" placeholder="出工姓名" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写出工事由' }]" v-model="value" label="出工事由" placeholder="出工事由" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写记工员' }]" v-model="value" label="记工员" placeholder="记工员" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写出工数' }]" v-model="value" label="出工数" placeholder="出工数" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写工日值' }]" v-model="value" label="工日值" placeholder="工日值" input-align="right" :border="false" />
-           <van-field required :rules="[{ required: true, message: '请填写金额（元）' }]" v-model="value" label="金额（元）" placeholder="金额（元）" input-align="right" :border="false" />
-           <van-field v-model="value" label="备注" placeholder="备注" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工姓名' }]" v-model="form.workerName" label="出工姓名" placeholder="出工姓名" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工事由' }]" v-model="form.workReason" label="出工事由" placeholder="出工事由" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写记工员' }]" v-model="form.workerNote" label="记工员" placeholder="记工员" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写出工数' }]" v-model="form.workNum" label="出工数" placeholder="出工数" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写工日值' }]" v-model="form.perMoney" label="工日值" placeholder="工日值" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true, message: '请填写金额（元）' }]" v-model="form.totalMoney" label="金额（元）" placeholder="金额（元）" input-align="right" :border="false" />
+           <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
 
          </div>
 
          <div style="margin: 16px auto;width: 50%;">
-           <van-button round block type="primary" native-type="submit">
+           <van-button round block type="primary"  @click="submitForm">
              保存
            </van-button>
          </div>
@@ -55,15 +56,16 @@
      </div>
  </template>
  <script>
-   import { addPermanent } from "@/api/sunVillage_info/fixedAssets";
+   import { addOddjob,updateOddjob } from "@/api/sunVillage_info/fixedAssets";
    export default {
      name: "certificateList",
      data() {
        return {
          minDate:new Date(1900,1,1),
+         maxDate: new Date(2050, 12, 31),
 
          showBuildTime:false,
-
+         form:{},
          buildTime:new Date(),
 
          value:''
@@ -74,9 +76,42 @@
      },
      methods: {
        onConfirmBuildTime(data){
-         this.form.buildTime = this.format(data,'yyyy-MM-dd');
+         this.form.jobTime = this.format(data,'yyyy-MM-dd');
          this.showBuildTime = false;
        },
+       submitForm(){
+         this.$refs.formData.validate().then(() => {
+           if (this.form.id) {
+             updateOddjob(this.form).then(response => {
+               if (response.code == 200) {
+                 this.$toast({
+                   icon: 'success',
+                   message: '保存成功',
+                   duration:"1000",
+                 });
+                 setTimeout(function(){
+                   history.back(-1);
+                 },2000)
+               }
+             });
+           } else {
+             addOddjob(this.form).then(response => {
+               if (response.code == 200) {
+                 this.$toast({
+                   icon: 'success',
+                   message: '保存成功',
+                   duration:"1000",
+                 });
+                 setTimeout(function(){
+                   history.back(-1);
+                 },2000)
+               }
+             });
+           }
+         }).catch(() => {
+           this.$notify({ type: 'danger', message: '请填写完整的表单项' });
+         });
+       },
      },
    }
  </script>
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index a1a0fbe8..ef50e546 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -365,13 +365,13 @@ export default {
 
           this.userForm.id = response.data.id;
           this.form.tableId = response.data.id;
-          showUserImg(response.data.id).then(responseSecond => {
-            console.log(responseSecond)
-            this.form.files = responseSecond.data
-            for (var i = 0 ; i < responseSecond.data.length ; i++){
-              this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
-            }
-          });
+          // showUserImg(response.data.id).then(responseSecond => {
+          //   console.log(responseSecond)
+          //   this.form.files = responseSecond.data
+          //   for (var i = 0 ; i < responseSecond.data.length ; i++){
+          //     this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
+          //   }
+          // });
         });
       });
     },
diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index 0ea482c9..bca14ed6 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -138,7 +138,7 @@ export default {
         });
         showImg(response.data.id).then(responseSecond => {
           for (var i = 0 ; i < responseSecond.data.length ; i++){
-            this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
+            this.fileList.push({url:'/api'+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
           }
         });
       });
diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
index c8915e0a..27aeed02 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -180,12 +180,13 @@
         var that = this;
         var str = val;
         var numArr = str.match(/\d+/g)
-        var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
-        console.log(numArr)
-        console.log(nameArr)
+        var nameArr = str.match(/[\u4e00-\u9fa5]/g)
+        if(nameArr != null){
+          nameArr = nameArr.join("")
+        }
         if (numArr) {
           numArr.map(rr=>{
-            if (rr.length>16) {
+            if (rr.length>=16) {
               const carId = isBankCard(rr);
               if (carId) {
                 that.form.payee = nameArr;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index a24ce9ac..2fb1a7d3 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -275,7 +275,7 @@
         </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
-        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button"  @click="deleteChargeItme(index)" />
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
           <van-field
             readonly
@@ -323,11 +323,41 @@
       <p class="main_title"  v-if="isModifyOrder" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;" v-if="isModifyOrder">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead('1')"  @click-preview="previewPreview" @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead('2')"   @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead('2')"  @click-preview="previewPreview"   @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead('3')"  @click-preview="previewPreview" @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row v-if="!isModifyOrder">
@@ -538,6 +568,120 @@
         let dd = new Date().getDate();
         _this.nowDate = moment(new Date()).format("YYYY-MM-DD");
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       initProjectInfo(){
         let _this = this
         let queryParams={
@@ -1168,6 +1312,20 @@
           commonAttach(params1).then((r1) => {
             file.id=r1.id;
             file.fileUrl = r1.fileUrl;
+            let subIndex = r1.fileUrl.lastIndexOf(".");
+            let ext =  r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length);
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+            let fileData =  {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext};
+            if(obj === '1'){
+              this.fileList1.splice(-1, 1);
+              this.fileList1.push(fileData);
+            }else if(obj === '2'){
+              this.fileList2.splice(-1, 1);
+              this.fileList2.push(fileData);
+            }else{
+              this.fileList3.splice(-1, 1);
+              this.fileList3.push(fileData);
+            }
           })
         }
       },
@@ -1184,7 +1342,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -1196,7 +1356,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -1208,7 +1370,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
index 88c65863..994183aa 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -232,11 +232,11 @@
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead1" @delete="deleteFile1" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead1" @delete="deleteFile1" @click-preview="previewPreview" style="margin-left:8px;"></van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead2" @delete="deleteFile2" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead2" @delete="deleteFile2" @click-preview="previewPreview" style="margin-left:8px;"></van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead3" @delete="deleteFile3" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead3" @delete="deleteFile3" @click-preview="previewPreview" style="margin-left:8px;"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -445,6 +445,120 @@
           }
         });
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       // 表单重置
       reset() {
         this.form = {
@@ -700,6 +814,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                             })
@@ -710,6 +825,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                             })
@@ -718,6 +834,7 @@
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               })
                           }
@@ -776,6 +893,7 @@
                                                       _this.$toast.success('提交成功');
                                                       setTimeout(function(){
                                                         history.go(-1)
+                                                        window.location.reload();
                                                       },2000)
                                                     }
                                                   })
@@ -792,6 +910,7 @@
                                                       _this.$toast.success('提交成功');
                                                       setTimeout(function(){
                                                         history.go(-1)
+                                                        window.location.reload();
                                                       },2000)
                                                     }
                                                   })
@@ -807,6 +926,7 @@
                                                     _this.$toast.success('提交成功');
                                                     setTimeout(function(){
                                                       history.go(-1)
+                                                      window.location.reload();
                                                     },2000)
                                                   }
                                                 })
@@ -828,6 +948,7 @@
                                                 _this.$toast.success('提交成功');
                                                 setTimeout(function(){
                                                   history.go(-1)
+                                                  window.location.reload();
                                                 },2000)
                                               }
                                             })
@@ -844,6 +965,7 @@
                                                 _this.$toast.success('提交成功');
                                                 setTimeout(function(){
                                                   history.go(-1)
+                                                  window.location.reload();
                                                 },2000)
                                               }
                                             })
@@ -859,6 +981,7 @@
                                               _this.$toast.success('提交成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -889,6 +1012,7 @@
                                               _this.$toast.success('提交成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -905,6 +1029,7 @@
                                               _this.$toast.success('提交成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -920,6 +1045,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           }
                                         })
@@ -940,6 +1066,7 @@
                                         _this.$toast.success('提交成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -956,6 +1083,7 @@
                                         _this.$toast.success('提交成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -971,6 +1099,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1011,6 +1140,7 @@
                                               _this.$toast.success('提交成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -1027,6 +1157,7 @@
                                               _this.$toast.success('提交成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -1043,6 +1174,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           }
                                         })
@@ -1063,6 +1195,7 @@
                                         _this.$toast.success('提交成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1079,6 +1212,7 @@
                                         _this.$toast.success('提交成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1094,6 +1228,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1124,6 +1259,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1140,6 +1276,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1155,6 +1292,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   }
                                 })
@@ -1175,6 +1313,7 @@
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1191,6 +1330,7 @@
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1206,6 +1346,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             }
                           })
@@ -1308,6 +1449,7 @@
                                                 _this.$toast.success('保存成功');
                                                 setTimeout(function(){
                                                   history.go(-1)
+                                                  window.location.reload();
                                                 },2000)
                                               }
                                             })
@@ -1322,6 +1464,7 @@
                                                 _this.$toast.success('保存成功');
                                                 setTimeout(function(){
                                                   history.go(-1)
+                                                  window.location.reload();
                                                 },2000)
                                               }
                                             })
@@ -1335,6 +1478,7 @@
                                               _this.$toast.success('保存成功');
                                               setTimeout(function(){
                                                 history.go(-1)
+                                                window.location.reload();
                                               },2000)
                                             }
                                           })
@@ -1353,6 +1497,7 @@
                                           _this.$toast.success('保存成功');
                                           setTimeout(function(){
                                             history.go(-1)
+                                            window.location.reload();
                                           },2000)
                                         }
                                       })
@@ -1367,6 +1512,7 @@
                                           _this.$toast.success('保存成功');
                                           setTimeout(function(){
                                             history.go(-1)
+                                            window.location.reload();
                                           },2000)
                                         }
                                       })
@@ -1380,6 +1526,7 @@
                                         _this.$toast.success('保存成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1408,6 +1555,7 @@
                                         _this.$toast.success('保存成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1422,6 +1570,7 @@
                                         _this.$toast.success('保存成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1435,6 +1584,7 @@
                                       _this.$toast.success('保存成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1453,6 +1603,7 @@
                                   _this.$toast.success('保存成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 }
                               })
@@ -1467,6 +1618,7 @@
                                   _this.$toast.success('保存成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 }
                               })
@@ -1480,6 +1632,7 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1518,6 +1671,7 @@
                                         _this.$toast.success('保存成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1532,6 +1686,7 @@
                                         _this.$toast.success('保存成功');
                                         setTimeout(function(){
                                           history.go(-1)
+                                          window.location.reload();
                                         },2000)
                                       }
                                     })
@@ -1545,6 +1700,7 @@
                                       _this.$toast.success('保存成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     }
                                   })
@@ -1563,6 +1719,7 @@
                                   _this.$toast.success('保存成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 }
                               })
@@ -1577,6 +1734,7 @@
                                   _this.$toast.success('保存成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 }
                               })
@@ -1590,6 +1748,7 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1618,6 +1777,7 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1632,6 +1792,7 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               }
                             })
@@ -1645,6 +1806,7 @@
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             }
                           })
@@ -1663,6 +1825,7 @@
                           _this.$toast.success('保存成功');
                           setTimeout(function(){
                             history.go(-1)
+                            window.location.reload();
                           },2000)
                         }
                       })
@@ -1677,6 +1840,7 @@
                           _this.$toast.success('保存成功');
                           setTimeout(function(){
                             history.go(-1)
+                            window.location.reload();
                           },2000)
                         }
                       })
@@ -1690,6 +1854,7 @@
                         _this.$toast.success('保存成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       }
                     })
@@ -1857,7 +2022,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -1869,7 +2036,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -1881,7 +2050,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
index a91de357..b294a63c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -782,6 +782,8 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
+
                         },2000)
                       })
                     }else{
@@ -789,6 +791,7 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     }
@@ -801,6 +804,7 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     }else{
@@ -808,6 +812,7 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     }
@@ -818,6 +823,7 @@
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }else{
@@ -825,6 +831,7 @@
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }
@@ -880,6 +887,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           })
                                         }else{
@@ -887,6 +895,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           })
                                         }
@@ -898,6 +907,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           })
                                         }else{
@@ -905,6 +915,7 @@
                                             _this.$toast.success('提交成功');
                                             setTimeout(function(){
                                               history.go(-1)
+                                              window.location.reload();
                                             },2000)
                                           })
                                         }
@@ -915,6 +926,7 @@
                                           _this.$toast.success('提交成功');
                                           setTimeout(function(){
                                             history.go(-1)
+                                            window.location.reload();
                                           },2000)
                                         })
                                       }else{
@@ -922,6 +934,7 @@
                                           _this.$toast.success('提交成功');
                                           setTimeout(function(){
                                             history.go(-1)
+                                            window.location.reload();
                                           },2000)
                                         })
                                       }
@@ -937,6 +950,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   }else{
@@ -944,6 +958,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   }
@@ -955,6 +970,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   }else{
@@ -962,6 +978,7 @@
                                       _this.$toast.success('提交成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   }
@@ -972,6 +989,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }else{
@@ -979,6 +997,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }
@@ -1004,6 +1023,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }else{
@@ -1011,6 +1031,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }
@@ -1022,6 +1043,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }else{
@@ -1029,6 +1051,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }
@@ -1039,6 +1062,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                               }else{
@@ -1046,6 +1070,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                               }
@@ -1061,6 +1086,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
@@ -1068,6 +1094,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }
@@ -1079,6 +1106,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
@@ -1086,6 +1114,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }
@@ -1096,6 +1125,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }else{
@@ -1103,6 +1133,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }
@@ -1138,6 +1169,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }else{
@@ -1145,6 +1177,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }
@@ -1156,6 +1189,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }else{
@@ -1163,6 +1197,7 @@
                                     _this.$toast.success('提交成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   })
                                 }
@@ -1173,6 +1208,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                               }else{
@@ -1180,6 +1216,7 @@
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
+                                    window.location.reload();
                                   },2000)
                                 })
                               }
@@ -1195,6 +1232,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
@@ -1202,6 +1240,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }
@@ -1213,6 +1252,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
@@ -1220,6 +1260,7 @@
                               _this.$toast.success('提交成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }
@@ -1230,6 +1271,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }else{
@@ -1237,6 +1279,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }
@@ -1262,6 +1305,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }else{
@@ -1269,6 +1313,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }
@@ -1280,6 +1325,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }else{
@@ -1287,6 +1333,7 @@
                             _this.$toast.success('提交成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           })
                         }
@@ -1297,6 +1344,7 @@
                           _this.$toast.success('提交成功');
                           setTimeout(function(){
                             history.go(-1)
+                            window.location.reload();
                           },2000)
                         })
                       }else{
@@ -1304,6 +1352,7 @@
                           _this.$toast.success('提交成功');
                           setTimeout(function(){
                             history.go(-1)
+                            window.location.reload();
                           },2000)
                         })
                       }
@@ -1319,6 +1368,7 @@
                       _this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }else{
@@ -1326,6 +1376,7 @@
                       _this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }
@@ -1337,6 +1388,7 @@
                       _this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }else{
@@ -1344,6 +1396,7 @@
                       _this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }
@@ -1354,6 +1407,7 @@
                     _this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
+                      window.location.reload();
                     },2000)
                   })
                 }else{
@@ -1361,6 +1415,7 @@
                     _this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
+                      window.location.reload();
                     },2000)
                   })
                 }
@@ -1446,6 +1501,7 @@
                                       _this.$toast.success('保存成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   } else if(_this.form.capitalExpenditureType==4){
@@ -1453,12 +1509,14 @@
                                       _this.$toast.success('保存成功');
                                       setTimeout(function(){
                                         history.go(-1)
+                                        window.location.reload();
                                       },2000)
                                     })
                                   }else{
                                     _this.$toast.success('保存成功');
                                     setTimeout(function(){
                                       history.go(-1)
+                                      window.location.reload();
                                     },2000)
                                   }
                                 }
@@ -1470,6 +1528,7 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               })
                             } else if(_this.form.capitalExpenditureType==4){
@@ -1477,12 +1536,14 @@
                                 _this.$toast.success('保存成功');
                                 setTimeout(function(){
                                   history.go(-1)
+                                  window.location.reload();
                                 },2000)
                               })
                             }else{
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             }
                           }
@@ -1504,6 +1565,7 @@
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           } else if(_this.form.capitalExpenditureType==4){
@@ -1511,12 +1573,14 @@
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
                             _this.$toast.success('保存成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           }
                         }
@@ -1528,6 +1592,7 @@
                         _this.$toast.success('保存成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     } else if(_this.form.capitalExpenditureType==4){
@@ -1535,12 +1600,14 @@
                         _this.$toast.success('保存成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     }else{
                       _this.$toast.success('保存成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     }
                   }
@@ -1572,6 +1639,7 @@
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           } else if(_this.form.capitalExpenditureType==4){
@@ -1579,12 +1647,14 @@
                               _this.$toast.success('保存成功');
                               setTimeout(function(){
                                 history.go(-1)
+                                window.location.reload();
                               },2000)
                             })
                           }else{
                             _this.$toast.success('保存成功');
                             setTimeout(function(){
                               history.go(-1)
+                              window.location.reload();
                             },2000)
                           }
                         }
@@ -1596,6 +1666,7 @@
                         _this.$toast.success('保存成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     } else if(_this.form.capitalExpenditureType==4){
@@ -1603,12 +1674,14 @@
                         _this.$toast.success('保存成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     }else{
                       _this.$toast.success('保存成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     }
                   }
@@ -1630,6 +1703,7 @@
                       _this.$toast.success('保存成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   } else if(_this.form.capitalExpenditureType==4){
@@ -1637,12 +1711,14 @@
                       _this.$toast.success('保存成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }else{
                     _this.$toast.success('保存成功');
                     setTimeout(function(){
                       history.go(-1)
+                      window.location.reload();
                     },2000)
                   }
                 }
@@ -1654,6 +1730,7 @@
                 this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
+                  window.location.reload();
                 },2000)
               })
             } else if(this.form.capitalExpenditureType==4){
@@ -1661,12 +1738,14 @@
                 this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
+                  window.location.reload();
                 },2000)
               })
             }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
+                window.location.reload();
               },2000)
             }
           }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
index 9f859446..4662d81d 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -78,7 +78,17 @@
     <p class="main_title">上传附件(收据)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  ></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList1" :key="index">
@@ -87,7 +97,17 @@
     <p class="main_title">上传附件(发票)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  ></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList2" :key="index">
@@ -96,7 +116,17 @@
     <p class="main_title">上传附件(其他)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  ></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList3" :key="index">
@@ -332,7 +362,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
         let oData2= {
@@ -344,7 +376,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
         let oData3= {
@@ -356,7 +390,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
       },
@@ -366,7 +402,7 @@
         const data = {
           taskId: this.$route.query.taskId,
           auditbatchNo: this.$route.query.auditbatchNo,
-          comment: this.comment,
+          remark: this.comment,
           pass: this.pass,
           };
         approval(data).then((response) => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
index 08e9061b..61eb68cd 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue
@@ -68,7 +68,17 @@
     <p class="main_title">上传附件(收据)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  ></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList1" :key="index">
@@ -77,7 +87,17 @@
     <p class="main_title">上传附件(发票)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  ></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList2" :key="index">
@@ -86,7 +106,17 @@
     <p class="main_title">上传附件(其他)</p>
     <div class="main_box" style="padding: 5px 0 0 8px;">
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  ></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
     <p style="margin-top:20px;padding: 0 10px">附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList3" :key="index">
@@ -315,7 +345,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
         let oData2= {
@@ -327,7 +359,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
         let oData3= {
@@ -339,7 +373,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext,"fileName":r.fileName})
           })
         })
       },
@@ -355,7 +391,7 @@
         const data = {
           taskId: this.$route.query.taskId,
           auditbatchNo: this.$route.query.auditbatchNo,
-          comment: this.comment,
+          remark: this.comment,
           pass: this.pass,
         };
         console.log(data);
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index 30254e95..a64781fd 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -15,8 +15,8 @@
     </van-nav-bar>
     <p class="main_title">基础信息</p>
     <div class="main_box">
-      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
-      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right"/>
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto"/>
       <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
       <van-field name="radio" label="审批模式" input-align="right" autocomplete="off" readonly>
         <template #input>
@@ -26,15 +26,18 @@
           </van-radio-group>
         </template>
       </van-field>
-      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
+      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)"
+                 input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
-      <van-field readonly label="转账附言" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+      <van-field readonly label="转账附言" v-model="form.remark" type="textarea" input-align="right" rows="3"
+                 label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
-      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3"
+                 label-width="auto"/>
     </div>
 
     <p class="main_title">付款方信息</p>
@@ -44,14 +47,14 @@
     </div>
 
     <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
-      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right"/>
       <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
       <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
-      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right"/>
       <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
     </div>
     <div class="main_box" v-if="contractOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
-      <van-field readonly label="合同名称" v-model="infoForm.name" input-align="right" />
+      <van-field readonly label="合同名称" v-model="infoForm.name" input-align="right"/>
       <van-field readonly label="合同编码" v-model="infoForm.code" input-align="right" label-width="auto"/>
       <van-field readonly label="合同价款（元）" v-model="infoForm.totalAmount" input-align="right" label-width="auto"/>
     </div>
@@ -59,116 +62,170 @@
     <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <van-field readonly label="收款账户类型" v-if="form.bankType==1" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
+      <van-field readonly label="收款账户类型" v-if="form.bankType==1" v-model="form.accountType == 1 ? '公户':'私户'"
+                 input-align="right" label-width="auto"/>
+      <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4"
+                 v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto"/>
 
     </div>
 
-    <div style="position:relative;" >
-      <div class="main_box" style="margin-bottom: 10px;position:relative;" v-for="(item, index) in chargeItme" :key="index" v-if="index<listLength">
-        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+    <div style="position:relative;">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;" v-for="(item, index) in chargeItme"
+           :key="index" v-if="index<listLength">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right"/>
         <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
         <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
-        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
-        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="转账状态" v-model="item.transferStatus" input-align="right" />
-        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="交易结果描述" v-model="item.causeFailure"  type="textarea" input-align="right" rows="3" label-width="auto" />
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right"/>
+        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="转账状态"
+                   v-model="item.transferStatus" input-align="right"/>
+        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="交易结果描述"
+                   v-model="item.causeFailure" type="textarea" input-align="right" rows="3" label-width="auto"/>
       </div>
-      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
+      <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">
+        查看更多</p>
       <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
     </div>
 
     <p class="main_title">上传附件</p>
     <div class="main_box" style="padding: 5px 0 0 0;">
-      <van-cell value="收据" />
-      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
-      <van-cell value="发票" />
-      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
-      <van-cell value="其他" />
-      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
+      <van-cell value="收据"/>
+      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false" disabled
+                    :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" @click-preview="previewPreview"
+                    :deletable="false" :max-count="fileList1.length" style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
+      <van-cell value="发票"/>
+      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false" disabled
+                    :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" @click-preview="previewPreview"
+                    :deletable="false" :max-count="fileList2.length" style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
+      <van-cell value="其他"/>
+      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false" disabled
+                    :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" @click-preview="previewPreview"
+                    :deletable="false" :max-count="fileList3.length" style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
   </div>
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    getTransfer,
+    queryTransferDetail,
+    listPayee,
+    updateTransfer,
+    getProjectto,
+    listProject,
+    addProjectto,
+    customSubmit,
+    getInfoto,
+    listTemplate
+  } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
     commonAttach,
     systemAttachment
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+
   export default {
     name: "approvalDetail",
     data() {
       return {
-        showcapital:false,
-        showpayee:false,
-        showlasj:false,
-        showbankType:false,
-        showproject:false,
-        showFundType:false,
-        showbtn:true,
+        showcapital: false,
+        showpayee: false,
+        showlasj: false,
+        showbankType: false,
+        showproject: false,
+        showFundType: false,
+        showbtn: true,
 
-        listLength:1,
+        listLength: 1,
 
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
-        form:{},
-        fileList1:[],
-        fileList2:[],
-        fileList3:[],
-        capitalExpenditureType:'',
-        payee:'',
-        bankType:'',
+        form: {},
+        fileList1: [],
+        fileList2: [],
+        fileList3: [],
+        capitalExpenditureType: '',
+        payee: '',
+        bankType: '',
 
-        wfydlxDictionaries:[],
-        jglxDictionaries:[],
-        sysDictionaries:[],
-        capitalExpenditureTypeOptions:[],
-        bankTypeDictionaries:[],
-        projectList:[],
-        projectFundTypeOptions:[],
-        transferStatusOptions:[],
-        projectFundTypeDictionaries:[],
-        projectList:[],
+        wfydlxDictionaries: [],
+        jglxDictionaries: [],
+        sysDictionaries: [],
+        capitalExpenditureTypeOptions: [],
+        bankTypeDictionaries: [],
+        projectList: [],
+        projectFundTypeOptions: [],
+        transferStatusOptions: [],
+        projectFundTypeDictionaries: [],
+        projectList: [],
 
-        chargeItme:[],
-        chargeItmeShow:[],
+        chargeItme: [],
+        chargeItmeShow: [],
 
-        payeeList:[],
+        payeeList: [],
         // 查询参数
         queryParams: {
-          transferType:"",
+          transferType: "",
           orderByColumn: "id",
           isAsc: "desc",
         },
-        capitalExpenditureOpen:false,
-        contractOpen:false,
-        projectForm:{
-          projectId:null,
-          projectName:null,
-          projectContractor:null,
-          projectAmount:null,
-          projectBillNum:null,
-          projectFundType:'1',
-          outId:null,
-          ynType:'1'
+        capitalExpenditureOpen: false,
+        contractOpen: false,
+        projectForm: {
+          projectId: null,
+          projectName: null,
+          projectContractor: null,
+          projectAmount: null,
+          projectBillNum: null,
+          projectFundType: '1',
+          outId: null,
+          ynType: '1'
         },
-        infoForm:{
-          infoId:null,
-          name:null,
-          code:null,
-          totalAmount:null,
-          contractionId:null,
-          transferId:null
+        infoForm: {
+          infoId: null,
+          name: null,
+          code: null,
+          totalAmount: null,
+          contractionId: null,
+          transferId: null
         },
-        projectFundType:'',
-        templateList:[],
+        projectFundType: '',
+        templateList: [],
       };
     },
     created() {
@@ -189,7 +246,7 @@
       this.getTemplateList();
     },
     methods: {
-      getTemplateList(){
+      getTemplateList() {
         let templateQueryParams = {
           // 分页
           pageNum: 1,
@@ -199,20 +256,20 @@
           this.templateList = response.rows;
         });
       },
-      tempalteFormat(id){
+      tempalteFormat(id) {
         let name = ""
         this.templateList.map(res => {
-          if(res.id==id){
+          if (res.id == id) {
             console.log(res.name)
-            name =  res.name
+            name = res.name
           }
         })
         return name
       },
-      goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
+      goFlow() {
+        window.location = 'approvalProcess?id=' + this.$route.query.id + '&auditbatchNo=' + this.$route.query.auditbatchNo;
       },
-      getDictionaries(){
+      getDictionaries() {
         getTransfer(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
@@ -220,17 +277,17 @@
             }
             this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
           });
-          if(response.data.capitalExpenditureType==2){
+          if (response.data.capitalExpenditureType == 2) {
             this.capitalExpenditureOpen = true
-            let param={
-              'outId' : response.data.id,
-              'ynType' : '1'
+            let param = {
+              'outId': response.data.id,
+              'ynType': '1'
             }
             getProjectto(param).then(res => {
               this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
               this.projectForm = res.data
             })
-          }else if(response.data.capitalExpenditureType==4) {
+          } else if (response.data.capitalExpenditureType == 4) {
             this.contractOpen = true
             let param = {
               'transferId': response.data.id
@@ -238,13 +295,13 @@
             getInfoto(param).then(res => {
               this.infoForm = res.data
             })
-          }else{
+          } else {
             this.showproject = false
           }
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          for (var j = 0 ; j < response.rows.length ; j++){
+          for (var j = 0; j < response.rows.length; j++) {
             response.rows[j].bankTypeText = this.selectDictLabel(this.bankTypeDictionaries, response.rows[j].bankType);
             response.rows[j].transferStatus = this.selectDictLabel(this.transferStatusOptions, response.rows[j].transferStatus);
           }
@@ -252,6 +309,120 @@
           this.getPayeeList();
         });
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file, fileType) {
+        return new Promise((resolve, reject) => {
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload = function () {
+            const base64String = reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,' + base64String);
+          }
+          reader.onerror = function () {
+            reject(new Error("Failed to load file"))
+          }
+        })
+      },
       getPayeeList() {
         //普通转账
         this.queryParams.accountType = this.form.accountType
@@ -262,8 +433,8 @@
           }
         });
       },
-      getFileList(){
-        let oData1= {
+      getFileList() {
+        let oData1 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -271,11 +442,13 @@
         }
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
-        let oData2= {
+        let oData2 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -283,11 +456,13 @@
         }
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
-        let oData3= {
+        let oData3 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -295,17 +470,19 @@
         }
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
-      goBack(){
+      goBack() {
         window.history.go(-1)
       },
       //删除家庭成员
-      deleteChargeItme(index){
-        this.chargeItme.splice(index,1)
+      deleteChargeItme(index) {
+        this.chargeItme.splice(index, 1)
       },
     },
   }
@@ -315,44 +492,49 @@
   .app-container {
     padding: 2% 0;
   }
-  .main_more{
+
+  .main_more {
     width: 96%;
     margin: 0 auto;
     margin-top: 10px;
     border-radius: 6px;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
     overflow: hidden;
     background-color: #FFF;
     text-align: center;
     padding: 10PX 0;
   }
-  .main_title{
+
+  .main_title {
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
     position: relative;
   }
-  .main_box{
+
+  .main_box {
     width: 96%;
     margin: 0 auto;
     border-radius: 6px;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
     overflow: hidden;
     background-color: #FFF;
   }
-  .submitButton{
+
+  .submitButton {
     width: 80%;
     margin: 0 auto;
     background-color: #1D6FE9;
   }
 
-  .addFamily{
+  .addFamily {
     position: absolute;
     top: -2px;
     right: 0;
     border-radius: 50%;
   }
-  .deleteFamily{
+
+  .deleteFamily {
     position: absolute;
     top: 0rem;
     right: 6%;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
index 3c8d4846..c933974a 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -72,13 +72,43 @@
     <div class="main_box" style="padding: 5px 0 0 0;">
       <van-cell value="收据" />
       <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" @click-preview="previewPreview" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="发票" />
       <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" @click-preview="previewPreview" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;">
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
       <van-cell value="其他" />
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0"  @click-preview="previewPreview" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" >
+        <template #preview-cover="file">
+          <div class="preview-cover">
+            <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+            <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+            <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+            <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+            <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+          </div>
+        </template>
+      </van-uploader>
     </div>
   </div>
 </template>
@@ -196,6 +226,120 @@
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
@@ -263,7 +407,9 @@
         attachmentList(oData1).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData2= {
@@ -275,7 +421,9 @@
         attachmentList(oData2).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
         let oData3= {
@@ -287,7 +435,9 @@
         attachmentList(oData3).then(res => {
           res.rows.map(r => {
             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
         })
       },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
index 427b8264..c220c427 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
@@ -21,7 +21,7 @@
         finished-text="没有更多了"
         @load="getList">
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payerAccount" center :to="{name:'approvalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
+          <van-cell :title="item.remark" center :to="{name:'approvalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn1.png" size="30" color="#FF4646" style="margin-right: 10px;" />
             </template>
@@ -29,8 +29,10 @@
               <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 30px;"></i>{{item.applyDate}}</p>
             </template>
             <template #default>
-              <p style="width: 80px;display: inline-block">{{item.auditStatus}}</p>
-              <p v-if="item.auditStatus === '通过' && item.paymentState === '待支付'" style="color: #606266;width: 80px;display: inline-block">{{item.paymentState}}</p>
+              <span v-if="item.auditStatus === '0'" style="color: #696969">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+              <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ selectDictLabel(auditStatusOptions, item.auditStatus)}} </span>
+              <span  v-else-if="item.auditStatus === '1' " style="color: #FFA500;">{{ selectDictLabel(auditStatusOptions, item.auditStatus) }} </span>
+              <p v-if="item.auditStatus === '3' && item.paymentState === '待支付'" style="color: #606266;width: 80px;display: inline-block">{{item.paymentState}}</p>
               <p v-else-if="item.paymentState === '银行受理'" style="width: 80px;display: inline-block">{{item.paymentState}}</p>
               <p v-else-if="(item.paymentState === '支付失败' || item.paymentState === '部分失败') && item.downId == null" style="color: #F56C6C;width: 80px;display: inline-block">{{item.paymentState}}-未重新申请</p>
               <p v-else-if="(item.paymentState === '支付失败' || item.paymentState === '部分失败') && item.downId != null" style="color: #E6A23C;width: 80px;display: inline-block">{{item.paymentState}}-已重新申请</p>
@@ -40,16 +42,16 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="修改" type="info" :to="{name:'approvalModify', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='待审'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='1'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.paymentState === '银行受理'" square text="核实结果" color="#FFA63E" type="info" @click="transactionStatusQuery(item.id)" class="delete-button" />
@@ -111,8 +113,10 @@ export default {
         listTransfer(this.queryParams).then(response => {
           console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatusOptions, response.rows[i].auditStatus);
             response.rows[i].paymentState = this.selectDictLabel(this.paymentStateOptions, response.rows[i].paymentState);
+            if(response.rows[i].remark.length > 12){
+              response.rows[i].remark = response.rows[i].remark.substring(0,12)+"...";
+            }
             this.applicationList.push(response.rows[i]);
           }
           console.log(this.applicationList.length >= response.total)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
index fbc118c2..02ad2105 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
@@ -22,10 +22,13 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'approvalDetail11', query: {id:item.id}}">
+          <van-cell :title="item.payer"  center :to="{name:'approvalDetail11', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn7.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
+            <span v-if="item.auditStatus === '0'">{{ selectDictLabel(this.auditStatusOptions, item.auditStatus)}} </span>
+            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ selectDictLabel(this.auditStatusOptions, item.auditStatus)}} </span>
+            <span  v-else style="color: #67c23a;">{{ selectDictLabel(this.auditStatusOptions, item.auditStatus) }} </span>
             <template #label>
               <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
             </template>
@@ -33,16 +36,16 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="修改" type="info" :to="{name:'approvalModify11', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="修改" type="info" :to="{name:'approvalModify11', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" color="#FFA63E" square text="提交" type="info" @click="onSubmit(item.id)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='草稿'||item.auditStatus=='驳回'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='0'||item.auditStatus=='2'" square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button v-if="item.auditStatus=='待审'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
+                <van-button v-if="item.auditStatus=='1'" square text="撤回" type="danger" @click="cancelApply(item)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -95,7 +98,6 @@ export default {
         listCash(this.queryParams).then(response => {
           console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatusOptions, response.rows[i].auditStatus);
             this.applicationList.push(response.rows[i]);
           }
           console.log(this.applicationList.length >= response.total)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 8c7f7fa0..8b7128d1 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -148,11 +148,13 @@
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
-        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况"
+                   input-align="right" rows="3" label-width="auto"/>
       </div>
 
       <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
-      <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <div class="main_box" v-if="capitalExpenditureOpen"
+           style="margin-bottom: 10px;margin-top: 10px;position:relative;">
         <van-field
           readonly
           clickable
@@ -173,8 +175,10 @@
             @cancel="showproject = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor"
+                   label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款（元）' }]" v-model="projectForm.projectAmount"
+                   label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
         <van-field
           readonly
           clickable
@@ -195,7 +199,8 @@
             @cancel="showFundType = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum"
+                   label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
       </div>
       <p class="main_title" v-if="contractOpen">关联合同</p>
       <div class="main_box" v-if="contractOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
@@ -219,8 +224,10 @@
             @cancel="showcontract = false"
           />
         </van-popup>
-        <van-field required :rules="[{ required: true , message:'请输入合同编码' }]" v-model="infoForm.code" label="合同编码" placeholder="请输入合同编码" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="infoForm.totalAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同编码' }]" v-model="infoForm.code" label="合同编码"
+                   placeholder="请输入合同编码" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="infoForm.totalAmount"
+                   label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
       </div>
       <p class="main_title">付款方信息</p>
       <div class="main_box">
@@ -246,25 +253,29 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'请输入账户' }]" required label="付款方账户" v-model="form.payerAccount"
+                   placeholder="请输入账户" input-align="right" label-width="auto"/>
       </div>
 
-      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-<!--      <div class="main_title main_title_box">-->
-<!--        <p>收款方信息</p>-->
-<!--        <router-link :to="{name:'collectionApprovalAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>-->
-<!--        <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>-->
-<!--      </div>-->
+      <p class="main_title">收款方信息
+        <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button"
+                    class="addFamily"/>
+      </p>
+      <!--      <div class="main_title main_title_box">-->
+      <!--        <p>收款方信息</p>-->
+      <!--        <router-link :to="{name:'collectionApprovalAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>-->
+      <!--        <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>-->
+      <!--      </div>-->
       <div class="main_box" style="margin-bottom: 15px;">
         <van-cell title="收款账户类型" v-if="form.bankType==1">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange" >
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
               <van-radio name="1">公户</van-radio>
               <van-radio name="2">私户</van-radio>
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>
@@ -273,8 +284,10 @@
           </template>
         </van-cell>
       </div>
-      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
-        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+      <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme"
+           :key="index">
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0"
+                    @click="deleteChargeItme(index)"/>
         <div class="main_box" style="margin-bottom: 10px;position:relative;">
           <van-field
             readonly
@@ -296,9 +309,12 @@
               @cancel="item.showPayee = false"
             />
           </van-popup>
-          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户"
+                     placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行"
+                     placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额"
+                     placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
           <van-field
             readonly
             clickable
@@ -319,22 +335,62 @@
           </van-popup>
         </div>
       </div>
-      <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
+      <p class="main_title" style="margin: 0.2rem 3%;">上传附件<i style="margin-right: 0.5em;"></i><span
+        style="font-size: 12px;color: red;">（若申请单未变动可不必点击底部的修改按钮）</span></p>
       <div class="main_box" style="padding: 5px 0 0 0;">
-        <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
-        <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
-        <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @delete="deleteFile" style="margin-left:8px;"></van-uploader>
+        <van-cell value="收据"/>
+        <van-uploader v-model="fileList1" :after-read="beforeRead('1')" @click-preview="previewPreview"
+                      @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+                <div class="preview-cover">
+                  <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+                  <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+                  <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+                  <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+                  <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+                </div>
+          </template>
+
+        </van-uploader>
+        <van-cell title="发票"/>
+        <van-uploader v-model="fileList2" :after-read="beforeRead('2')" @click-preview="previewPreview"
+                      @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
+        <van-cell title="其他"/>
+        <van-uploader v-model="fileList3" :after-read="beforeRead('3')" @click-preview="previewPreview"
+                      @delete="deleteFile" style="margin-left:8px;">
+          <template #preview-cover="file">
+            <div class="preview-cover">
+              <img src="../../../../assets/images/sunVillage_info/WORD.png" width="75" v-if="file.type == 'docx' || file.type == 'doc'"/>
+              <img src="../../../../assets/images/sunVillage_info/ECEL.png" width="75" v-if="file.type == 'xlsx' || file.type == 'xls'" />
+              <img src="../../../../assets/images/sunVillage_info/PDF.png" width="75" v-if="file.type == 'pdf'" />
+              <img src="../../../../assets/images/sunVillage_info/PPT.png" width="75" v-if="file.type == 'ppt'" />
+              <img src="../../../../assets/images/sunVillage_info/RAR.png" width="75" v-if="file.type == 'zip' || file.type == 'rar'" />
+            </div>
+          </template>
+        </van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">修<i
+              style="margin-right: 1em;"></i>改
+            </van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i style="margin-right: 1em;"></i>交</van-button>
+            <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">提<i
+              style="margin-right: 1em;"></i>交
+            </van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -344,8 +400,24 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,
-    customSubmit ,offlineCustomSubmit, getQmyeFlow ,listInfo ,getInfoto ,addInfoto,listTemplate,selectApprovalByTemplateId} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import {
+    getAccount,
+    getTransfer,
+    queryTransferDetail,
+    listPayee,
+    updateTransfer,
+    getProjectto,
+    listProject,
+    addProjectto,
+    customSubmit,
+    offlineCustomSubmit,
+    getQmyeFlow,
+    listInfo,
+    getInfoto,
+    addInfoto,
+    listTemplate,
+    selectApprovalByTemplateId
+  } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     attachmentList,
     commonAttach,
@@ -353,71 +425,72 @@
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
   import Dialog from "vant/lib/dialog";
+
   export default {
     name: "approvalModify",
     data() {
       return {
-        showtemplate:false,
-        showcontract:false,
-        showcapital:false,
-        showpayee:false,
-        showlasj:false,
-        showbankType:false,
-        showproject:false,
-        showFundType:false,
-        showpayer:false,
+        showtemplate: false,
+        showcontract: false,
+        showcapital: false,
+        showpayee: false,
+        showlasj: false,
+        showbankType: false,
+        showproject: false,
+        showFundType: false,
+        showpayer: false,
 
         minDate: new Date(2000, 1, 1),
         maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
-        form:{},
+        form: {},
 
-        capitalExpenditureType:'',
-        payee:'',
-        bankType:'',
+        capitalExpenditureType: '',
+        payee: '',
+        bankType: '',
 
-        buttonType:'a',
+        buttonType: 'a',
+        fileType:"",
+        wfydlxDictionaries: [],
+        jglxDictionaries: [],
+        sysDictionaries: [],
+        capitalExpenditureTypeOptions: [],
+        bankTypeDictionaries: [],
+        infoList: [],
+        projectList: [],
+        projectFundTypeOptions: [],
+        projectFundTypeDictionaries: [],
+        payerOptions: [],
 
-        wfydlxDictionaries:[],
-        jglxDictionaries:[],
-        sysDictionaries:[],
-        capitalExpenditureTypeOptions:[],
-        bankTypeDictionaries:[],
-        infoList:[],
-        projectList:[],
-        projectFundTypeOptions:[],
-        projectFundTypeDictionaries:[],
-        payerOptions:[],
+        chargeItme: [],
+        chargeItmeShow: [],
 
-        chargeItme:[],
-        chargeItmeShow:[],
-
-        payeeList:[],
+        payeeList: [],
         // 查询参数
         queryParams: {
-          transferType:"",
+          transferType: "",
           orderByColumn: "id",
           isAsc: "desc",
         },
-        capitalExpenditureOpen:false,
-        contractOpen:false,
-        projectForm:{
-          projectId:null,
-          projectName:null,
-          projectContractor:null,
-          projectAmount:null,
-          projectBillNum:null,
-          projectFundType:'1',
-          outId:null,
-          ynType:'1'
+        capitalExpenditureOpen: false,
+        contractOpen: false,
+        projectForm: {
+          projectId: null,
+          projectName: null,
+          projectContractor: null,
+          projectAmount: null,
+          projectBillNum: null,
+          projectFundType: '1',
+          outId: null,
+          ynType: '1'
         },
-        infoForm:{
-          infoId:null,
-          name:null,
-          code:null,
-          totalAmount:null,
-          contractionId:null,
-          transferId:null
+        infoForm: {
+          infoId: null,
+          name: null,
+          code: null,
+          totalAmount: null,
+          contractionId: null,
+          transferId: null
         },
         // 合同信息查询参数
         queryContractionParams: {
@@ -427,18 +500,18 @@
           orderByColumn: "endTime",
           isAsc: "desc",
         },
-        projectFundType:'',
-        fileList1:[],
-        fileList2:[],
-        fileList3:[],
-        templateList:[],
+        projectFundType: '',
+        fileList1: [],
+        fileList2: [],
+        fileList3: [],
+        templateList: [],
       };
     },
-    activated:function(){
+    activated: function () {
       this.getDictionaries();
     },
     created() {
-      let queryParams={
+      let queryParams = {
         pageNum: 1,
         pageSize: 100,
       }
@@ -446,15 +519,15 @@
       listProject(queryParams).then(response => {
         this.projectList = response.rows;
         for (let i = 0; i < response.rows.length; i++) {
-          this.$set(this.projectList[i],"text",response.rows[i].projectName)
-          this.$set(this.projectList[i],"value",response.rows[i].id)
+          this.$set(this.projectList[i], "text", response.rows[i].projectName)
+          this.$set(this.projectList[i], "value", response.rows[i].id)
         }
       });
       listInfo(this.queryContractionParams).then(response => {
         this.infoList = response.rows;
         for (let i = 0; i < response.rows.length; i++) {
-          this.$set(this.infoList[i],"text",response.rows[i].name)
-          this.$set(this.infoList[i],"value",response.rows[i].code)
+          this.$set(this.infoList[i], "text", response.rows[i].name)
+          this.$set(this.infoList[i], "value", response.rows[i].code)
         }
       });
       this.getDicts("project_fund_type").then((response) => {
@@ -463,14 +536,14 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
-      let params1={
+      let params1 = {
         accountType: "102",
-       // "params":{townAccountType:'0'},
+        // "params":{townAccountType:'0'},
         status: "N",
       }
       getAccount(params1).then((response) => {
         this.payerOptions = response.rows;
-        response.rows.map((res,index) => {
+        response.rows.map((res, index) => {
           res['payerFrom'] = '1'
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
@@ -481,27 +554,27 @@
 
     methods: {
 
-      goFlow(){
-        if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){
-          window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode;
-        }else{
-            this.$notify({ type: 'danger', message: '无审批流程！' });
+      goFlow() {
+        if (this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined") {
+          window.location = 'approvalProcess3?approvalTemplateId=' + this.form.approvalTemplateId + '&approvalMode=' + this.form.approvalMode;
+        } else {
+          this.$notify({type: 'danger', message: '无审批流程！'});
         }
       },
-      onConfirmTemplate(data){
+      onConfirmTemplate(data) {
         selectApprovalByTemplateId(data.id).then(res => {
           this.showtemplate = false;
-          if(res.approvalDetails.length>0){
+          if (res.approvalDetails.length > 0) {
             this.form.approvalTemplateName = data.name
             this.form.approvalTemplateId = data.id
-          }else{
+          } else {
             this.form.approvalTemplateName = null
             this.form.approvalTemplateId = null
-            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+            this.$notify({type: 'danger', message: '此流程无节点，无法选择！'});
           }
         })
       },
-      getDictionaries(){
+      getDictionaries() {
         getTransfer(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
             for (var i = 0; i < res.data.length; i++) {
@@ -509,25 +582,25 @@
             }
             this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
           });
-          if(response.data.capitalExpenditureType==2){
+          if (response.data.capitalExpenditureType == 2) {
             this.capitalExpenditureOpen = true
-            let param={
-              'outId' : response.data.id,
-              'ynType' : '1'
+            let param = {
+              'outId': response.data.id,
+              'ynType': '1'
             }
             getProjectto(param).then(res => {
               this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
               this.projectForm = res.data
             })
-          }else if(response.data.capitalExpenditureType==4){
+          } else if (response.data.capitalExpenditureType == 4) {
             this.contractOpen = true
-            let param={
-              'transferId' : response.data.id
+            let param = {
+              'transferId': response.data.id
             }
             getInfoto(param).then(res => {
               this.infoForm = res.data
             })
-          }else{
+          } else {
             this.showproject = false
           }
           this.form = response.data;
@@ -537,12 +610,12 @@
             // 分页
             pageNum: 1,
             pageSize: 999,
-            type:'1'
+            type: '1'
           };
           listTemplate(templateQueryParams).then(rrr => {
             this.templateList = rrr.rows;
             this.templateList.map(ra => {
-              if(ra.id == response.data.approvalTemplateId){
+              if (ra.id == response.data.approvalTemplateId) {
                 _this.form.approvalTemplateName = ra.name
               }
             })
@@ -553,7 +626,7 @@
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
-            for (var j = 0 ; j < response.rows.length ; j++){
+            for (var j = 0; j < response.rows.length; j++) {
               // response.rows[j].payeeText = response.rows[j].payee;
               response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
               response.rows[j].showPayee = false;
@@ -562,39 +635,39 @@
           });
         });
       },
-      getChange(){
-        if(this.buttonType == 'update'){
+      getChange() {
+        if (this.buttonType == 'update') {
           this.goUpdate();
-        }else if(this.buttonType == 'add'){
+        } else if (this.buttonType == 'add') {
           this.goAdd();
         }
       },
-      getError(e){
-        this.$notify({ type: 'danger', message: e.errors[0].message });
+      getError(e) {
+        this.$notify({type: 'danger', message: e.errors[0].message});
       },
-      addChargeItme(index){
-        if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
-          this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
+      addChargeItme(index) {
+        if (this.chargeItme.length > 0 && this.chargeItme[this.chargeItme.length - 1].payee == '') {
+          this.$notify({type: 'danger', message: '请勿添加多个空列表信息'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].incomeAmount == ''){
-          this.$notify({ type: 'danger', message: '请输入收入金额！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].incomeAmount == '') {
+          this.$notify({type: 'danger', message: '请输入收入金额！'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].payeeAccount == ''){
-          this.$notify({ type: 'danger', message: '请输入收款账户！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].payeeAccount == '') {
+          this.$notify({type: 'danger', message: '请输入收款账户！'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankDeposit == ''){
-          this.$notify({ type: 'danger', message: '请输入开户银行！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].bankDeposit == '') {
+          this.$notify({type: 'danger', message: '请输入开户银行！'});
           return;
-        }else if(this.chargeItme.length>0&&this.chargeItme[index-1].bankType == ''){
-          this.$notify({ type: 'danger', message: '请选择所属银行！' });
+        } else if (this.chargeItme.length > 0 && this.chargeItme[index - 1].bankType == '') {
+          this.$notify({type: 'danger', message: '请选择所属银行！'});
           return;
         }
         // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
         //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
         // }else
-        if(this.form.bankType == '7' && this.chargeItme.length==1){
-          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
-        }else{
+        if (this.form.bankType == '7' && this.chargeItme.length == 1) {
+          this.$notify({type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！'});
+        } else {
           this.getDicts("bank_type_all").then(res => {
             this.chargeItme.splice(index + 1, 0, {
               payeeId: "", //收款方ID
@@ -603,21 +676,22 @@
               bankDeposit: "", //开户银行
               incomeAmount: "", //收入金额
               bankType: null, //所属银行
-              bankTypeText:"", //所属银行
-              showPayee:false,
-              showbankType:false
+              bankTypeText: "", //所属银行
+              showPayee: false,
+              showbankType: false
             });
-          });}
+          });
+        }
       },
       getPayeeList() {
         //普通转账
-        this.queryParams.isPeers = this.form.isPeers?this.form.isPeers:null
-        this.queryParams.accountType = this.form.accountType?this.form.accountType:null
+        this.queryParams.isPeers = this.form.isPeers ? this.form.isPeers : null
+        this.queryParams.accountType = this.form.accountType ? this.form.accountType : null
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
-          response.rows.map((res,index) => {
-            if(res.payeeType==1||res.payeeType==2){
+          response.rows.map((res, index) => {
+            if (res.payeeType == 1 || res.payeeType == 2) {
               res.text = res.payee;
               res.value = res.id;
               this.payeeList.push(res)
@@ -635,16 +709,138 @@
         })
         return actions.join('');
       },
-      onConfirmCapital(data){
-        if (data.value == 2){
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          this.fileType = ext;
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          this.fileType = ext;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file, fileType) {
+        return new Promise((resolve, reject) => {
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload = function () {
+            const base64String = reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,' + base64String);
+          }
+          reader.onerror = function () {
+            reject(new Error("Failed to load file"))
+          }
+        })
+      },
+      onConfirmCapital(data) {
+        if (data.value == 2) {
           this.capitalExpenditureOpen = true;
           this.contractOpen = false
           this.infoForm = {};
-        }else if(data.value == 4){
+        } else if (data.value == 4) {
           this.capitalExpenditureOpen = false;
           this.contractOpen = true
           this.projectForm = {};
-        }else{
+        } else {
           this.capitalExpenditureOpen = false;
           this.contractOpen = false
           this.projectForm = {};
@@ -654,14 +850,14 @@
         this.form.capitalExpenditureType = data.value;
         this.showcapital = false;
       },
-      onConfirmFundType(data){
+      onConfirmFundType(data) {
         this.projectForm.projectFundType = data.value;
         this.projectFundType = data.text;
         this.showFundType = false;
       },
-      onConfirmProject(data){
+      onConfirmProject(data) {
         this.projectList.map(res => {
-          if(res.projectName==data.text){
+          if (res.projectName == data.text) {
             this.projectForm.projectId = res.id
             this.projectForm.projectName = res.projectName
             this.projectForm.projectContractor = res.projectContractor
@@ -670,9 +866,9 @@
         })
         this.showproject = false;
       },
-      onConfirmContract(data){
+      onConfirmContract(data) {
         this.infoList.map(res => {
-          if(res.name==data.text){
+          if (res.name == data.text) {
             this.infoForm.contractionId = res.id;
             this.infoForm.name = res.name;
             this.infoForm.code = res.code;
@@ -681,33 +877,33 @@
         })
         this.showcontract = false;
       },
-      onConfirmPayee(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+      onConfirmPayee(data, index) {
+        for (var i = 0; i < this.chargeItme.length; i++) {
           this.chargeItme[i].showPayee = false;
         }
         this.chargeItme[index].payee = data.text;
         this.chargeItme[index].payeeId = data.value;
-        this.payeeSelectChange(data.value , index)
+        this.payeeSelectChange(data.value, index)
       },
-      onConfirmBankType(data,index){
-        for (var i = 0 ; i < this.chargeItme.length ; i++){
+      onConfirmBankType(data, index) {
+        for (var i = 0; i < this.chargeItme.length; i++) {
           this.chargeItme[i].showbankType = false;
         }
         this.chargeItme[index].bankTypeText = data.text;
         this.chargeItme[index].bankType = data.value;
         this.chargeItme[index].showbankType = false;
       },
-      onConfirmPayer(data){
+      onConfirmPayer(data) {
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.showpayer = false;
         this.selectChange(data.value)
       },
-      onConfirmLasj(data){
-        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
+      onConfirmLasj(data) {
+        this.form.applyDate = this.getNowFormatDate(data).substr(0, 10);
         this.showlasj = false;
       },
-      accountTypeChange(e){
+      accountTypeChange(e) {
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
@@ -715,8 +911,8 @@
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
-          response.rows.map((res,index) => {
-            if(res.payeeType==1||res.payeeType==2){
+          response.rows.map((res, index) => {
+            if (res.payeeType == 1 || res.payeeType == 2) {
               response.rows[index].text = res.payee;
               response.rows[index].value = res.id;
               this.payeeList.push(res)
@@ -724,7 +920,7 @@
           })
         });
       },
-      accountTypeChange1(e){
+      accountTypeChange1(e) {
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
@@ -732,8 +928,8 @@
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
-          response.rows.map((res,index) => {
-            if(res.payeeType==1||res.payeeType==2){
+          response.rows.map((res, index) => {
+            if (res.payeeType == 1 || res.payeeType == 2) {
               response.rows[index].text = res.payee;
               response.rows[index].value = res.id;
               this.payeeList.push(res)
@@ -754,59 +950,59 @@
         });
         this.$set(this.form, "expenditureAmount", total);
       },
-      goAdd(){
+      goAdd() {
         let _this = this
-        if(this.chargeItme.length<1){
-          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+        if (this.chargeItme.length < 1) {
+          this.$notify({type: 'danger', message: '请添加收款方信息'});
           return;
         }
-        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$notify({ type: 'danger', message: '转账附言禁止包含！' });
+        if (this.form.remark != null && this.form.remark.indexOf("|") != -1) {
+          this.$notify({type: 'danger', message: '转账附言禁止包含！'});
           return;
         }
-        if(this.form.capitalExpenditureType==2){
-          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+        if (this.form.capitalExpenditureType == 2) {
+          if (this.projectForm.projectName == "" || this.projectForm.projectName == null) {
+            this.$notify({type: 'danger', message: '请选择项目名称！'});
             return;
           }
-          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+          if (this.projectForm.projectBillNum == "" || this.projectForm.projectBillNum == null) {
+            this.$notify({type: 'danger', message: '请输入工程发票号！'});
             return;
           }
         }
-        if(this.form.capitalExpenditureType==4){
-          if(this.infoForm.name==""||this.infoForm.name==null){
-            this.$notify({ type: 'danger', message: '请选择合同名称！' });
+        if (this.form.capitalExpenditureType == 4) {
+          if (this.infoForm.name == "" || this.infoForm.name == null) {
+            this.$notify({type: 'danger', message: '请选择合同名称！'});
             return;
           }
-          if(this.infoForm.code==""||this.infoForm.code==null){
-            this.$notify({ type: 'danger', message: '请输入合同编码！' });
+          if (this.infoForm.code == "" || this.infoForm.code == null) {
+            this.$notify({type: 'danger', message: '请输入合同编码！'});
             return;
           }
-          if(this.infoForm.totalAmount==""||this.infoForm.totalAmount==null){
-            this.$notify({ type: 'danger', message: '请输入合同价款！' });
+          if (this.infoForm.totalAmount == "" || this.infoForm.totalAmount == null) {
+            this.$notify({type: 'danger', message: '请输入合同价款！'});
             return;
           }
         }
-        if(
-          this.fileList1.length==0&&
-          this.fileList2.length==0&&
-          this.fileList3.length==0){
+        if (
+          this.fileList1.length == 0 &&
+          this.fileList2.length == 0 &&
+          this.fileList3.length == 0) {
           Dialog.confirm({
             title: '提示',
             message: '此申请单中未上传任何附件，是否确认提交？',
           })
             .then(() => {
-                this.saveRelease()
+              this.saveRelease()
             })
             .catch(() => {
               return false;
             });
-        }else{
+        } else {
           this.saveRelease()
         }
       },
-      saveRelease(){
+      saveRelease() {
         let _this = this;
         this.$set(this.form, "payeeList", this.chargeItme);
         this.$set(this.form, "bankTypeList", this.chargeItme);
@@ -817,65 +1013,65 @@
           this.projectForm.outId = this.form.id
           this.infoForm.transferId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
+          if (this.form.capitalExpenditureType == 2) {
             addProjectto(this.projectForm).then(res => {
-                offlineCustomSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
+              offlineCustomSubmit(this.form.id).then(res => {
+                this.$toast.success('提交成功');
+                setTimeout(function () {
+                  _this.$router.push('/yinnong/approvalList')
+                }, 1000)
+              })
             })
-          }else if(this.form.capitalExpenditureType==4){
+          } else if (this.form.capitalExpenditureType == 4) {
             addInfoto(this.infoForm).then(res => {
-                offlineCustomSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-            })
-          }else{
               offlineCustomSubmit(this.form.id).then(res => {
                 this.$toast.success('提交成功');
-                setTimeout(function(){
+                setTimeout(function () {
                   _this.$router.push('/yinnong/approvalList')
-                },1000)
+                }, 1000)
               })
+            })
+          } else {
+            offlineCustomSubmit(this.form.id).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function () {
+                _this.$router.push('/yinnong/approvalList')
+              }, 1000)
+            })
           }
         });
       },
-      goUpdate(){
+      goUpdate() {
         let _this = this
-        if(this.chargeItme.length<1){
-          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+        if (this.chargeItme.length < 1) {
+          this.$notify({type: 'danger', message: '请添加收款方信息'});
           return;
         }
-        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$notify({ type: 'danger', message: '转账附言禁止包含！' });
+        if (this.form.remark != null && this.form.remark.indexOf("|") != -1) {
+          this.$notify({type: 'danger', message: '转账附言禁止包含！'});
           return;
         }
-        if(this.form.capitalExpenditureType==2){
-          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$notify({ type: 'danger', message: '请选择项目名称！' });
+        if (this.form.capitalExpenditureType == 2) {
+          if (this.projectForm.projectName == "" || this.projectForm.projectName == null) {
+            this.$notify({type: 'danger', message: '请选择项目名称！'});
             return;
           }
-          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
+          if (this.projectForm.projectBillNum == "" || this.projectForm.projectBillNum == null) {
+            this.$notify({type: 'danger', message: '请输入工程发票号！'});
             return;
           }
         }
-        if(this.form.capitalExpenditureType==4){
-          if(this.infoForm.name==""||this.infoForm.name==null){
-            this.$notify({ type: 'danger', message: '请选择合同名称！' });
+        if (this.form.capitalExpenditureType == 4) {
+          if (this.infoForm.name == "" || this.infoForm.name == null) {
+            this.$notify({type: 'danger', message: '请选择合同名称！'});
             return;
           }
-          if(this.infoForm.code==""||this.infoForm.code==null){
-            this.$notify({ type: 'danger', message: '请输入合同编码！' });
+          if (this.infoForm.code == "" || this.infoForm.code == null) {
+            this.$notify({type: 'danger', message: '请输入合同编码！'});
             return;
           }
-          if(this.infoForm.totalAmount==""||this.infoForm.totalAmount==null){
-            this.$notify({ type: 'danger', message: '请输入合同价款！' });
+          if (this.infoForm.totalAmount == "" || this.infoForm.totalAmount == null) {
+            this.$notify({type: 'danger', message: '请输入合同价款！'});
             return;
           }
         }
@@ -888,25 +1084,25 @@
           this.infoForm.transferId = this.form.id
           this.$set(this.projectForm, "ynType", '1');
 
-          if(this.form.capitalExpenditureType==2){
+          if (this.form.capitalExpenditureType == 2) {
             addProjectto(this.projectForm).then(res => {
               this.$toast.success('保存成功');
-              setTimeout(function(){
-                 _this.$router.push('/yinnong/approvalList')
-              },1000)
+              setTimeout(function () {
+                _this.$router.push('/yinnong/approvalList')
+              }, 1000)
             })
-          } else if(this.form.capitalExpenditureType==4){
+          } else if (this.form.capitalExpenditureType == 4) {
             addInfoto(this.infoForm).then(res => {
               this.$toast.success('保存成功');
-              setTimeout(function(){
-                 _this.$router.push('/yinnong/approvalList')
-              },1000)
+              setTimeout(function () {
+                _this.$router.push('/yinnong/approvalList')
+              }, 1000)
             })
-          }else{
+          } else {
             this.$toast.success('保存成功');
-            setTimeout(function(){
-               _this.$router.push('/yinnong/approvalList')
-            },1000)
+            setTimeout(function () {
+              _this.$router.push('/yinnong/approvalList')
+            }, 1000)
           }
 
         });
@@ -917,26 +1113,26 @@
         let _this = this
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
-          return account.id === select ; //筛选出匹配数据
+          return account.id === select; //筛选出匹配数据
         });
-        if(this.chargeItme != [] && this.chargeItme.length>1){
+        if (this.chargeItme != [] && this.chargeItme.length > 1) {
           this.chargeItme.some((value, index) => {
-            if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
+            if (value.payeeAccount != undefined && value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount && index != i) {
               fuzhitype = 2;
               return true;
             }
-            if(_this.form.isPeers!=undefined&&_this.form.isPeers!=null&&_this.form.isPeers=='N'){
+            if (_this.form.isPeers != undefined && _this.form.isPeers != null && _this.form.isPeers == 'N') {
 
-            }else{
-              if(obj.bankType==1&&value.accountType != undefined &&value.accountType != '' && obj.accountType != value.accountType&&index!=i){
+            } else {
+              if (obj.bankType == 1 && value.accountType != undefined && value.accountType != '' && obj.accountType != value.accountType && index != i) {
                 fuzhitype = 1;
                 return true;
               }
             }
           });
         }
-        if(fuzhitype == 0){
-          this.$set(this.chargeItme[i], "payee",obj.payee)
+        if (fuzhitype == 0) {
+          this.$set(this.chargeItme[i], "payee", obj.payee)
           this.$set(this.chargeItme[i], "bankType", obj.bankType)
           this.$set(this.chargeItme[i], "payeeId", obj.id);
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
@@ -944,30 +1140,30 @@
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
           this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
           _this.bankTypeDictionaries.map(rr => {
-            if(rr.value==obj.bankType){
+            if (rr.value == obj.bankType) {
               this.$set(this.chargeItme[i], "bankTypeText", rr.text);
             }
           })
-        }else if(fuzhitype == 1){
-          this.$set(this.chargeItme[i], "payee",'')
-          this.$set(this.chargeItme[i], "bankType",'')
+        } else if (fuzhitype == 1) {
+          this.$set(this.chargeItme[i], "payee", '')
+          this.$set(this.chargeItme[i], "bankType", '')
           this.$set(this.chargeItme[i], "payeeId", '');
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$set(this.chargeItme[i], "bankTypeText", '');
-          this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
-        }else if(fuzhitype == 2){
-          this.$set(this.chargeItme[i], "payee",'')
-          this.$set(this.chargeItme[i], "bankType",'')
+          this.$notify({type: 'danger', message: '请选择账户类型相同的收款方！'});
+        } else if (fuzhitype == 2) {
+          this.$set(this.chargeItme[i], "payee", '')
+          this.$set(this.chargeItme[i], "bankType", '')
           this.$set(this.chargeItme[i], "payeeId", '');
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$set(this.chargeItme[i], "bankTypeText", '');
-          this.$notify({ type: 'danger', message: '收款方已存在！' });
+          this.$notify({type: 'danger', message: '收款方已存在！'});
         }
       },
       selectChange(select) {
@@ -976,8 +1172,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "") {
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -987,54 +1183,54 @@
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
-          if(obj.bankType==1){
+          if (obj.bankType == 1) {
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();
-          }else if(obj.bankType==2||obj.bankType==4){
+          } else if (obj.bankType == 2 || obj.bankType == 4) {
             this.form.accountType = null
             this.form.isPeers = "Y"
             this.accountTypeChange1();
           }
-        }else{
-          if(obj.payerFrom==1){
+        } else {
+          if (obj.payerFrom == 1) {
             this.diglogStatus = false;
-            this.$notify({ type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！" });
-            this.$set(this.form,"payer","")
-            this.$set(this.form,"payerAccount","")
-          }else{
+            this.$notify({type: 'danger', message: "请完善付款方“操作员代码”、“企业编码”、“支付口令”等信息！"});
+            this.$set(this.form, "payer", "")
+            this.$set(this.form, "payerAccount", "")
+          } else {
             this.$set(this.form, "payerFrom", obj.parerFrom);
-            if(obj.operatorCode!=null&&obj.operatorCode!=''){
+            if (obj.operatorCode != null && obj.operatorCode != '') {
               this.$set(this.form, "operatorCode", obj.operatorCode);
-            }else{
+            } else {
               this.$set(this.form, "operatorCode", '');
             }
-            if(obj.enterpriseCode!=null&&obj.enterpriseCode!=''){
+            if (obj.enterpriseCode != null && obj.enterpriseCode != '') {
               this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-            }else{
+            } else {
               this.$set(this.form, "enterpriseCode", '');
             }
-            if(obj.accountPassword!=null&&obj.accountPassword!=''){
+            if (obj.accountPassword != null && obj.accountPassword != '') {
               this.$set(this.form, "accountPassword", obj.accountPassword);
-            }else{
+            } else {
               this.$set(this.form, "accountPassword", '');
             }
-            this.$set(this.form, "bookId",'');
+            this.$set(this.form, "bookId", '');
             this.$set(this.form, "deptId", '');
             this.$set(this.form, "cashierId", obj.id);
             this.$set(this.form, "payer", obj.accountName);
-            if(obj.payerFrom==6){
+            if (obj.payerFrom == 6) {
               getQmyeFlow(obj.bankAccountNumber).then((response) => {
                 this.$set(this.form, "payerAccount", response.data);
               });
-            }else {
+            } else {
               this.$set(this.form, "payerAccount", obj.bankAccountNumber);
             }
           }
         }
       },
       beforeRead(obj) {
-        return (file) =>{
+        return (file) => {
           let params1 = new FormData();
           params1.append("tableId", this.form.id);
           params1.append("tableName", "t_yinnong_transfer");
@@ -1042,17 +1238,32 @@
           params1.append("fileType", obj);
           params1.append("file", file.file);
           commonAttach(params1).then((r1) => {
-            file.id=r1.id;
+            file.id = r1.id;
             file.fileUrl = r1.fileUrl;
+            let subIndex = r1.fileUrl.lastIndexOf(".");
+            let ext =  r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length);
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+            let fileData =  {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext};
+            if(obj === '1'){
+              this.fileList1.splice(-1, 1);
+              this.fileList1.push(fileData);
+            }else if(obj === '2'){
+              this.fileList2.splice(-1, 1);
+              this.fileList2.push(fileData);
+            }else{
+              this.fileList3.splice(-1, 1);
+              this.fileList3.push(fileData);
+            }
           })
         }
       },
-      deleteFile(file){
-        systemAttachment(file.id).then((res) => {});
+      deleteFile(file) {
+        systemAttachment(file.id).then((res) => {
+        });
       },
 
-      getFileList(){
-        let oData1= {
+      getFileList() {
+        let oData1 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -1061,13 +1272,15 @@
         attachmentList(oData1).then(res => {
           let arr = [];
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL;
-            arr.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL;
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            arr.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
           this.fileList1 = arr;
           this.$forceUpdate()
         })
-        let oData2= {
+        let oData2 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -1076,13 +1289,15 @@
         attachmentList(oData2).then(res => {
           let arr = [];
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            arr.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            arr.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
           this.fileList2 = arr;
           this.$forceUpdate()
         })
-        let oData3= {
+        let oData3 = {
           tableId: this.$route.query.id,
           tableName: "t_yinnong_transfer",
           bizPath: "transfer",
@@ -1091,27 +1306,29 @@
         attachmentList(oData3).then(res => {
           let arr = [];
           res.rows.map(r => {
-            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
-            arr.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+            let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL
+            let subIndex = r.fileName.lastIndexOf(".");
+            let ext =  r.fileName.substring(subIndex + 1, r.fileName.length);
+            arr.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext})
           })
           this.fileList3 = arr;
           this.$forceUpdate()
         })
       },
-      goBack(){
-        this.$router.push({path:'/yinnong/approvalList'})
+      goBack() {
+        this.$router.push({path: '/yinnong/approvalList'})
       },
       //删除家庭成员
-      deleteChargeItme(index){
-        this.chargeItme.splice(index,1)
+      deleteChargeItme(index) {
+        this.chargeItme.splice(index, 1)
       },
     },
     watch: {
-      $route (to, from ) {
+      $route(to, from) {
         // 监听路由变化, 实现类似 小程序的 onShow 事件
         if (to.path === '/yinnong/approvalModify') {
           // do anything you want
-          if (this.$route.params.payeeForm){
+          if (this.$route.params.payeeForm) {
             this.chargeItme.push(this.$route.params.payeeForm)
           }
         }
@@ -1124,12 +1341,14 @@
   .app-container {
     padding: 2% 0;
   }
-  .main_title_box{
+
+  .main_title_box {
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
-  .main_title{
+
+  .main_title {
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
@@ -1141,27 +1360,30 @@
     /*  border-radius: 5PX;*/
     /*}*/
   }
-  .main_box{
+
+  .main_box {
     width: 96%;
     margin: 0 auto;
     border-radius: 6px;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
     overflow: hidden;
     background-color: #FFF;
   }
-  .submitButton{
+
+  .submitButton {
     width: 80%;
     margin: 0 auto;
     background-color: #1D6FE9;
   }
 
-  .addFamily{
+  .addFamily {
     position: absolute;
     top: -2px;
     right: 0;
     border-radius: 50%;
   }
-  .deleteFamily{
+
+  .deleteFamily {
     position: absolute;
     top: 0rem;
     right: 6%;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
index f3921ed4..fe9778c4 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -234,11 +234,11 @@
       <p class="main_title">上传附件</p>
       <div class="main_box" style="padding: 5px 0 0 0;">
         <van-cell value="收据" />
-        <van-uploader v-model="fileList1" :after-read="beforeRead1" @delete="deleteFile1" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList1" :after-read="beforeRead1" @click-preview="previewPreview" @delete="deleteFile1" style="margin-left:8px;"></van-uploader>
         <van-cell title="发票" />
-        <van-uploader v-model="fileList2" :after-read="beforeRead2" @delete="deleteFile2" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList2" :after-read="beforeRead2" @click-preview="previewPreview" @delete="deleteFile2" style="margin-left:8px;"></van-uploader>
         <van-cell title="其他" />
-        <van-uploader v-model="fileList3" :after-read="beforeRead3" @delete="deleteFile3" style="margin-left:8px;"></van-uploader>
+        <van-uploader v-model="fileList3" :after-read="beforeRead3" @click-preview="previewPreview" @delete="deleteFile3" style="margin-left:8px;"></van-uploader>
       </div>
       <div style="padding: 16px 0;">
         <van-row>
@@ -2148,6 +2148,120 @@
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
+      previewPreview(file, index, len) {
+        const baseImgUrl = this.$store.getters.baseRoutingUrl;
+        if (file.url) {
+          //已上传文件
+          let fileName = file.file.name || file.url;
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          let imgi = file.listIndex
+          //console.log(ext)
+          let allUrl = file.url;
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            const link = document.createElement("a");
+            link.style.display = "none";
+            link.target = "_blank"
+            link.href = allUrl;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+
+        } else {
+          //新上传文件
+          let fileName = file.file.name;
+          // console.info(file.file.name)
+          let subIndex = fileName.lastIndexOf(".");
+          let ext = fileName.substring(subIndex + 1, fileName.length);
+          if(ext  !== 'jpg' && ext  !== 'png' && ext  !== 'gif' && ext  !== 'svg' && ext  !== 'ico' && ext  !== 'bmp'){
+            let type = this.getfileType(ext);
+            // 将文件转换为base64编码
+            this.fileToBase64(file.file, ext).then(res => {
+              this.downloadFile(res, fileName, ext, type);
+            })
+          }
+        }
+      },
+      getfileType(type) {
+        switch (type) {
+          case 'txt':
+            return 'text/plain';
+          case 'doc':
+            return 'application/msword';
+          case 'docx':
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+          case 'xls':
+            return 'application/vnd.ms-excel';
+          case 'xlsx':
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+          case 'pdf':
+            return 'application/pdf';
+          case 'pptx':
+            return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+          case 'png':
+            return 'image/png';
+          case 'jpg':
+            return 'image/jpeg';
+          case 'gif':
+            return 'image/gif';
+          case 'svg':
+            return 'image/svg+xml';
+          case 'ico':
+            return 'image/x-icon';
+          case 'bmp':
+            return 'image/bmp,';;
+        }
+      },
+      downloadFile(base64, fileName, fileType, mimetype) {
+        const typeHeader = 'data:application/' + fileType + ';base64,';
+        const blob = this.base64ToBlob(base64, mimetype);
+        this.downloadFileDownload(blob, fileName, fileType);
+      },
+      base64ToBlob(base64, mime) {
+        //解码base64得到二进制字符串
+
+        let raw = window.atob(base64.substring(base64.indexOf(',') + 1));
+        let rawLength = raw.length
+        //创建8位无符号整数值的类型化数组
+        let uInt8Array = new Uint8Array(rawLength)
+        for (let i = 0; i < rawLength; ++i) {
+          uInt8Array[i] = raw.charCodeAt(i);
+        }
+        return new Blob([uInt8Array], {type: mime})
+      },
+      downloadFileDownload(blob, fileName, fileType) {
+        const downloadElement = document.createElement('a');
+        let href = blob;
+        if (typeof blob === 'string') {
+          downloadElement.target = '_blank'
+        } else {
+          href = window.URL.createObjectURL(blob)
+        }
+        downloadElement.href = href;
+        downloadElement.download = fileName + '.' + fileType;//下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click();
+        document.body.removeChild(downloadElement)
+        if (typeof blob !== 'string') {
+          window.URL.revokeObjectURL(href)
+        }
+      },
+      fileToBase64(file,fileType){
+        return new Promise((resolve,reject)=>{
+          //创建一个新的FileReader 对象
+          const reader = new FileReader();
+          //读取file对象
+          reader.readAsDataURL(file);
+          reader.onload=function () {
+            const base64String =  reader.result.split(",")[1];
+            resolve('data:application/' + fileType + ';base64,'+base64String);
+          }
+          reader.onerror=function () {
+            reject(new Error("Failed to load file") )
+          }
+        })
+      },
       selectChange(select) {
         let obj = {};
         obj = this.payerOptions.find((account) => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue
index b8fc45ed..78c35aaf 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue
@@ -598,6 +598,7 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     })
@@ -606,6 +607,7 @@
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }
@@ -616,6 +618,7 @@
                         this.$toast.success('提交成功');
                         setTimeout(function(){
                           history.go(-1)
+                          window.location.reload();
                         },2000)
                       })
                     })
@@ -624,6 +627,7 @@
                       this.$toast.success('提交成功');
                       setTimeout(function(){
                         history.go(-1)
+                        window.location.reload();
                       },2000)
                     })
                   }
@@ -658,6 +662,7 @@
                     this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
+                      window.location.reload();
                     },2000)
                   })
                 })
@@ -666,6 +671,7 @@
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     history.go(-1)
+                    window.location.reload();
                   },2000)
                 })
               }
@@ -676,6 +682,7 @@
                     this.$toast.success('提交成功');
                     setTimeout(function(){
                       history.go(-1)
+                      window.location.reload();
                     },2000)
                   })
                 })
@@ -684,6 +691,7 @@
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     history.go(-1)
+                    window.location.reload();
                   },2000)
                 })
               }
@@ -736,12 +744,14 @@
                 this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
+                  window.location.reload();
                 },2000)
               })
             }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
+                window.location.reload();
               },2000)
             }
           }else{
@@ -750,12 +760,14 @@
                 this.$toast.success('保存成功');
                 setTimeout(function(){
                   history.go(-1)
+                  window.location.reload();
                 },2000)
               })
             }else{
               this.$toast.success('保存成功');
               setTimeout(function(){
                 history.go(-1)
+                window.location.reload();
               },2000)
             }
           }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
index eca231ae..a1bc235d 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -25,7 +25,7 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
+        <van-row  v-for="(item1,index,i) in processList" :key="i">
           <van-col span="4" align="right">
             <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
             <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
@@ -109,8 +109,8 @@ export default {
   },
   methods: {
     //查询审批进程
-    getTransferProcess(id){
-      getTransferProcess(id).then(res => {
+    getTransferProcess(auditbatchNo){
+      getTransferProcess(auditbatchNo).then(res => {
         this.processList = res.data[auditbatchNo]
       })
     },
@@ -119,7 +119,7 @@ export default {
         this.form = response.data;
         this.processList = {}
         if(this.form.auditStatus != 0){
-          this.getTransferProcess(this.$route.query.id);
+          this.getTransferProcess(this.$route.query.auditbatchNo);
         }
         if(this.form.approvalMode == 1){
           selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue
index 246243fb..051601f9 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue
@@ -25,7 +25,7 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
+        <van-row  v-for="(item1,index,i) in processList" :key="i">
           <van-col span="4" align="right">
             <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
             <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
@@ -114,8 +114,8 @@ export default {
   },
   methods: {
     //查询审批进程
-    getTransferProcess1(id){
-      getTransferProcess(id).then(res => {
+    getTransferProcess1(auditbatchNo){
+      getTransferProcess(auditbatchNo).then(res => {
         this.processList = res.data[auditbatchNo]
       })
     },
@@ -124,7 +124,7 @@ export default {
         this.form = response.data;
         this.processList = {}
         if(this.form.auditStatus != 0){
-          this.getTransferProcess1(this.$route.query.id);
+          this.getTransferProcess1(this.$route.query.auditbatchNo);
         }
         if(this.form.approvalMode == 1){
           selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => {
diff --git a/src/views/yinnong/bankAgriculture/recordDetail/recordDetailList.vue b/src/views/yinnong/bankAgriculture/recordDetail/recordDetailList.vue
index 74c51989..79a854e2 100644
--- a/src/views/yinnong/bankAgriculture/recordDetail/recordDetailList.vue
+++ b/src/views/yinnong/bankAgriculture/recordDetail/recordDetailList.vue
@@ -48,14 +48,14 @@
             </template>
             <template #label>
               <p style="font-size: 12px;font-weight: normal;color: #878787;display: flex;justify-content: space-between;">
-                <span style="width: 100%;text-align:left;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;word-break: 
+                <span style="width: 100%;text-align:left;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;word-break:
                 break-all;overflow: hidden;">{{item.payeeToname}}</span>
               </p>
             </template>
             <template #default>
               <p style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;word-break: break-all;overflow: hidden;">{{item.actacn}}</p>
               <p style="font-size: 12px;font-weight: normal;color: #878787;display: flex;justify-content: space-between;">
-                <span style="width: 100%;text-align:right;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;word-break: 
+                <span style="width: 100%;text-align:right;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;word-break:
                 break-all;overflow: hidden;">{{item.payeeActacn}}</span>
               </p>
             </template>
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { listRecordDetail, getRecordDetail,getDianzihuidan} from "@/api/onlineHome/bankAgriculture/recordDetail";  
+import { listRecordDetail, getRecordDetail,getDianzihuidan} from "@/api/onlineHome/bankAgriculture/recordDetail";
 import { getAccount} from "@/api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "recordDetailList",
@@ -109,7 +109,7 @@ export default {
         for (var i = 0; i < response.rows.length; i++) {
           this.applicationList.push(response.rows[i]);
         }
-        if(this.applicationList != null && this.applicationList != [] && this.applicationList.length>0){
+        if(this.applicationList != null && this.applicationList != []){
           if(this.applicationList.length >= response.total){
             this.finished = true;
             return;
@@ -120,6 +120,7 @@ export default {
         }
       });
     },
+
     getAccountList(){
       let params1={
         accountType: "102",
diff --git a/src/views/yinnong/doneCompleted/completed.vue b/src/views/yinnong/doneCompleted/completed.vue
deleted file mode 100644
index eb8472f8..00000000
--- a/src/views/yinnong/doneCompleted/completed.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <div>
-    <van-nav-bar
-      title="待办事项"
-    />
-    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
-      <van-swipe-item v-for="(image,index) in images" :key="index">
-        <img :src="image" style="width:100%;height: 128px"/>
-      </van-swipe-item>
-    </van-swipe>
-    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="">
-            <van-col span="23" :offset="1">
-
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
-                <van-image
-                  height="20"
-                  width="20"
-                  style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
-            </van-col>
-            <van-col span="10" :offset="1">
-              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>
-            </van-col>
-            <van-col span="5" :offset="1">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-empty v-if="taskList.length<1" description="暂无事项" />
-    <yinnongIndex></yinnongIndex>
-  </div>
-</template>
-
-<script>
-    import onlineHomeIndex from "../../onlineHomeIndex";
-    import yinnongIndex from "../../yinnongIndex";
-    import { getInfo } from "../../../api/login/index";
-    import {ListDone, ListTodo} from "../../../api/onlineHome/done";
-
-    export default {
-      components: {
-        onlineHomeIndex,
-        yinnongIndex
-      },
-        name: "done",
-      data(){
-        return{
-          taskList:[],
-          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
-          total:0,
-          nickName:"",
-          electronicSignature:"",
-          queryParams: {
-            pageNum: 1,
-            pageSize: 100,
-          },
-          activityBusinessTypeOptions:[],
-          images:['../../../../static/images/onlineHome/banner_03.png'],
-        }
-      },
-      created() {
-        this.getDicts("activity_business_type").then((response) => {
-          this.activityBusinessTypeOptions = response.data;
-          if(this.$route.query.activeName){
-            this.activeName = this.$route.query.activeName
-          }
-          this.getList();
-        });
-        console.log(this.$route.query.fr)
-        if(this.$route.query.fr){
-          this.$cookies.set("from",this.$route.query.fr,"0")
-        }
-        getInfo().then((response) => {
-            this.electronicSignature = response.user.electronicSignature;
-            this.nickName = response.user.nickName;
-        });
-      },
-      methods: {
-        goOnlineHomeIndex(){
-          if(this.$cookies.get("from")=="my"){
-            this.$router.push({name:"yinnongMy"})
-          }else{
-            this.$router.push({name:"yinnongWorkbench"})
-          }
-        },
-        getList() {
-          this.taskList = []
-          // this.$set(this.queryParams, "systemType", '4');
-          ListTodo(this.queryParams).then((response) => {
-            response.rows.map(res => {
-              if(res.tableName?res.tableName.indexOf('house')>0:""){
-                res.tableName = '来自农村宅基地管理系统'
-              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }
-              if(this.activityBusinessTypeOptions){
-                this.activityBusinessTypeOptions.map(t => {
-                  if(t.dictValue == res.formData.activityBusinessType){
-                    res.formData.activityBusinessType = t.dictLabel
-                    this.taskList.push(res)
-                  }
-                });
-              }
-            })
-          })
-        },
-        goDetail(item){
-          console.log(item)
-          let type = item.formData.processKey;
-          switch (type) {
-            case 'homeuseZyyctcsq':
-              this.$router.push({name:'sunVillageInfoPaidExitDetail',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type,electronicSignature:this.electronicSignature,nickName:this.nickName}})
-              break;
-            case 'home_check':
-            case 'home_start':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type,electronicSignature:this.electronicSignature,nickName:this.nickName}})
-              break;
-            case 'home_apply':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type,electronicSignature:this.electronicSignature,nickName:this.nickName}})
-              break;
-            case 'baseApply':
-            case 'landscope':
-            case 'accepting':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
-              break;
-            case 'toReviewTransferProcess':
-            case 'yinnong_transfer':
-              if(item.formData.transferType == '10'){
-                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType == '11'){
-                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType == '12'){
-                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
-                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-            case 'yinnong_majorevent':
-              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-          }
-        }
-      },
-    }
-</script>
-
-<style scoped>
-  >>>.my-swipe .van-swipe-item {
-    color: #fff;
-    font-size: 20px;
-    line-height: 144px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index 45dad854..dda2fa97 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -14,18 +14,18 @@
       finished-text="没有更多了"
       @load="getList"
     >
-    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell style="padding: 0 0">
         <template #title>
           <van-row style="">
             <van-col span="23" :offset="1">
 
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+              <p style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
                 <van-image
                   height="20"
                   width="20"
                   style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.systemType =='4'?selectDictLabel(transferTypeOptions, item.data.transferType):item.auditName}}</h3>
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</p>
             </van-col>
           </van-row>
         </template>
@@ -34,7 +34,7 @@
         <template #title>
           <van-row>
             <van-col span="6" :offset="1">
-              <p style="color: #878787" >{{item.createTime?item.createTime.substring(0,10):item.data.updateTime.substring(0,10)}}</p>
+              <p style="color: #878787" >{{item.createTime.substring(0,10)}}</p>
             </van-col>
             <van-col span="10" :offset="1">
               <p style="color: #878787">{{item.businessType}}</p>
diff --git a/src/views/yinnong/doneCompleted/done.vue b/src/views/yinnong/doneCompleted/done.vue
deleted file mode 100644
index 2d81f866..00000000
--- a/src/views/yinnong/doneCompleted/done.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-done.vue<template>
-  <div>
-    <van-nav-bar
-      title="已办事项"
-    />
-    <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:128px;border-radius: 6px;">
-      <van-swipe-item v-for="(image,index) in images" :key="index">
-        <img :src="image" style="width:100%;height: 128px"/>
-      </van-swipe-item>
-    </van-swipe>
-    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
-        <template #title>
-          <van-row style="">
-            <van-col span="23" :offset="1">
-
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
-                <van-image
-                  height="20"
-                  width="20"
-                  style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.projectName}}</h3>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
-            </van-col>
-            <van-col span="10" :offset="1">
-              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>
-            </van-col>
-            <van-col span="5" :offset="1">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    <van-empty v-if="taskList.length<1" description="暂无事项" />
-    <yinnongIndex></yinnongIndex>
-  </div>
-</template>
-
-<script>
-    import onlineHomeIndex from "../../onlineHomeIndex";
-    import yinnongIndex from "../../yinnongIndex";
-    import {ListDone, ListTodo} from "../../../api/onlineHome/done";
-
-    export default {
-      components: {
-        onlineHomeIndex,
-        yinnongIndex
-      },
-        name: "done",
-      data(){
-        return{
-          taskList:[],
-          activeName:this.$route.query.activeName?this.$route.query.activeName:'2',
-          total:0,
-          queryParams: {
-            pageNum: 1,
-            pageSize: 100,
-          },
-          activityBusinessTypeOptions:[],
-          images:['../../../../static/images/onlineHome/banner_02.png'],
-        }
-      },
-      created() {
-        this.getDicts("activity_business_type").then((response) => {
-          this.activityBusinessTypeOptions = response.data;
-          if(this.$route.query.activeName){
-            this.activeName = this.$route.query.activeName
-          }
-          this.getList();
-        });
-        console.log(this.$route.query.fr)
-        if(this.$route.query.fr){
-          this.$cookies.set("from",this.$route.query.fr,"0")
-        }
-
-      },
-      methods: {
-        goOnlineHomeIndex(){
-          if(this.$cookies.get("from")=="my"){
-            this.$router.push({name:"yinnongMy"})
-          }else{
-            this.$router.push({name:"yinnongWorkbench"})
-          }
-        },
-        getList() {
-          this.taskList = []
-          // this.$set(this.queryParams, "systemType", '4');
-          ListDone(this.queryParams).then((response) => {
-            response.rows.map(res => {
-              if(res.tableName?res.tableName.indexOf('house')>0:""){
-                res.tableName = '来自农村宅基地管理系统'
-              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }
-              if(this.activityBusinessTypeOptions){
-                this.activityBusinessTypeOptions.map(t => {
-                  if(t.dictValue == res.formData.activityBusinessType){
-                    res.formData.activityBusinessType = t.dictLabel
-                    this.taskList.push(res)
-                  }
-                });
-              }
-            })
-          })
-        },
-        goDetail(item){
-          console.log(item)
-          let type = item.formData.processKey;
-          switch (type) {
-            case 'homeuseZyyctcsq':
-              this.$router.push({name:'sunVillageInfoPaidExitDetail',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
-              break;
-            case 'home_check':
-            case 'home_start':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
-              break;
-            case 'home_apply':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
-              break;
-            case 'baseApply':
-            case 'landscope':
-            case 'accepting':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
-              break;
-            case 'toReviewTransferProcess':
-            case 'yinnong_transfer':
-              if(item.formData.transferType == '10'){
-                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType == '11'){
-                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType == '12'){
-                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
-                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-            case 'yinnong_majorevent':
-              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-              break;
-          }
-        }
-      },
-    }
-</script>
-
-<style scoped>
-  >>>.my-swipe .van-swipe-item {
-    color: #fff;
-    font-size: 20px;
-    line-height: 144px;
-    text-align: center;
-  }
-</style>
diff --git a/src/views/yinnong/doneCompleted/doneNew.vue b/src/views/yinnong/doneCompleted/doneNew.vue
index 12d0170f..7c7eb344 100644
--- a/src/views/yinnong/doneCompleted/doneNew.vue
+++ b/src/views/yinnong/doneCompleted/doneNew.vue
@@ -8,18 +8,18 @@ done.vue<template>
         <img :src="image" style="width:100%;height: 150px"/>
       </van-swipe-item>
     </van-swipe>
-    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell>
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+      <van-cell style="padding: 0 0">
         <template #title>
           <van-row style="">
             <van-col span="23" :offset="1">
 
-              <h3 style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+              <p style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
                 <van-image
                   height="20"
                   width="20"
                   style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.systemType =='4'?selectDictLabel(transferTypeOptions, item.data.transferType):item.auditName}}</h3>
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</p>
             </van-col>
           </van-row>
         </template>
@@ -34,7 +34,8 @@ done.vue<template>
               <p style="color: #878787">{{item.businessType}}</p>
             </van-col>
             <van-col span="5" :offset="1">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+              <p v-if="item.auditStatus == '2'" style="font-size: 14px;font-weight:bold;text-align: right;color: red">驳回</p>
+              <p v-if="item.auditStatus == '3'" style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">通过</p>
             </van-col>
           </van-row>
         </template>
diff --git a/src/views/yinnongIndex.vue b/src/views/yinnongIndex.vue
index 6b79f04f..0505193b 100644
--- a/src/views/yinnongIndex.vue
+++ b/src/views/yinnongIndex.vue
@@ -4,9 +4,9 @@
     <van-tabbar route :placeholder="true" >
 <!--      <van-tabbar-item replace to="/yinnong/publicity" icon="bullhorn-o">公示</van-tabbar-item>-->
 <!--      <van-tabbar-item replace to="/yinnong/doneCompleted/completed" icon="todo-list-o">待办</van-tabbar-item>-->
-      <van-tabbar-item replace to="/yinnong/doneCompleted/completedNew" icon="todo-list-o">待办(新)</van-tabbar-item>
+      <van-tabbar-item replace to="/yinnong/doneCompleted/completedNew" icon="todo-list-o">待办</van-tabbar-item>
 <!--      <van-tabbar-item replace to="/yinnong/doneCompleted/done" icon="completed">已办</van-tabbar-item>-->
-      <van-tabbar-item replace to="/yinnong/doneCompleted/doneNew" icon="completed">已办(新)</van-tabbar-item>
+      <van-tabbar-item replace to="/yinnong/doneCompleted/doneNew" icon="completed">已办</van-tabbar-item>
       <van-tabbar-item replace to="/yinnong/workbench" icon="apps-o">工作台</van-tabbar-item>
       <!-- <van-tabbar-item replace to="/yinnong/home" icon="wap-home-o">家园</van-tabbar-item> -->
       <van-tabbar-item replace to="/yinnong/my" icon="manager-o">我的</van-tabbar-item>
diff --git a/static/images/pest/address.png b/static/images/pest/address.png
new file mode 100644
index 00000000..89019bf5
Binary files /dev/null and b/static/images/pest/address.png differ
diff --git a/static/images/pest/daytime.png b/static/images/pest/daytime.png
new file mode 100644
index 00000000..9bef3e55
Binary files /dev/null and b/static/images/pest/daytime.png differ
diff --git a/static/images/pest/flex_main_left_bg.png b/static/images/pest/flex_main_left_bg.png
new file mode 100644
index 00000000..40cbbc34
Binary files /dev/null and b/static/images/pest/flex_main_left_bg.png differ
diff --git a/static/images/pest/flex_main_left_icon.png b/static/images/pest/flex_main_left_icon.png
new file mode 100644
index 00000000..ebcfe432
Binary files /dev/null and b/static/images/pest/flex_main_left_icon.png differ
diff --git a/static/images/pest/growth_icon_01.png b/static/images/pest/growth_icon_01.png
new file mode 100644
index 00000000..cde1ad07
Binary files /dev/null and b/static/images/pest/growth_icon_01.png differ
diff --git a/static/images/pest/growth_icon_02.png b/static/images/pest/growth_icon_02.png
new file mode 100644
index 00000000..f98d1661
Binary files /dev/null and b/static/images/pest/growth_icon_02.png differ
diff --git a/static/images/pest/list_img.png b/static/images/pest/list_img.png
new file mode 100644
index 00000000..028dad05
Binary files /dev/null and b/static/images/pest/list_img.png differ
diff --git a/static/images/pest/map_bg.png b/static/images/pest/map_bg.png
new file mode 100644
index 00000000..43df46d2
Binary files /dev/null and b/static/images/pest/map_bg.png differ
diff --git a/static/images/pest/search_icon.png b/static/images/pest/search_icon.png
new file mode 100644
index 00000000..0aa1f3f5
Binary files /dev/null and b/static/images/pest/search_icon.png differ
diff --git a/static/images/pest/weather/weather_icon_01.png b/static/images/pest/weather/weather_icon_01.png
new file mode 100644
index 00000000..a4554589
Binary files /dev/null and b/static/images/pest/weather/weather_icon_01.png differ
diff --git a/static/images/pest/weather/weather_icon_02.png b/static/images/pest/weather/weather_icon_02.png
new file mode 100644
index 00000000..778cd45d
Binary files /dev/null and b/static/images/pest/weather/weather_icon_02.png differ
diff --git a/static/images/pest/weather/weather_icon_03.png b/static/images/pest/weather/weather_icon_03.png
new file mode 100644
index 00000000..a3b5074d
Binary files /dev/null and b/static/images/pest/weather/weather_icon_03.png differ
diff --git a/static/images/pest/weather/weather_icon_04.png b/static/images/pest/weather/weather_icon_04.png
new file mode 100644
index 00000000..5a3ebcb1
Binary files /dev/null and b/static/images/pest/weather/weather_icon_04.png differ
diff --git a/static/images/pest/weather/weather_icon_05.png b/static/images/pest/weather/weather_icon_05.png
new file mode 100644
index 00000000..5d7593ea
Binary files /dev/null and b/static/images/pest/weather/weather_icon_05.png differ
diff --git a/static/images/pest/weather/weather_icon_06.png b/static/images/pest/weather/weather_icon_06.png
new file mode 100644
index 00000000..277237af
Binary files /dev/null and b/static/images/pest/weather/weather_icon_06.png differ
diff --git a/static/images/pest/weather/weather_icon_07.png b/static/images/pest/weather/weather_icon_07.png
new file mode 100644
index 00000000..4f8505b7
Binary files /dev/null and b/static/images/pest/weather/weather_icon_07.png differ
diff --git a/static/images/pest/weather/weather_icon_08.png b/static/images/pest/weather/weather_icon_08.png
new file mode 100644
index 00000000..c4be9bb5
Binary files /dev/null and b/static/images/pest/weather/weather_icon_08.png differ
diff --git a/static/images/pest/weather/weather_icon_09.png b/static/images/pest/weather/weather_icon_09.png
new file mode 100644
index 00000000..7c8f2fba
Binary files /dev/null and b/static/images/pest/weather/weather_icon_09.png differ
diff --git a/static/images/pest/weather/weather_icon_10.png b/static/images/pest/weather/weather_icon_10.png
new file mode 100644
index 00000000..c9a22367
Binary files /dev/null and b/static/images/pest/weather/weather_icon_10.png differ