Merge remote-tracking branch 'origin/master'

src/api/login/index.js

@@ -111,3 +111,27 @@ export function registerOn(mobile) {
     data: mobile
   })
 }
+
+// 春耕app登录: 用户
+export function chungengUserLogin(code) {
+  return request({
+    url: '/chungeng/userLogin',
+    method: 'post',
+    data: {code},
+    headers: {
+      isToken: false
+    }
+  })
+}
+
+// 春耕app登录: 农户
+export function chungengFarmerLogin(code) {
+  return request({
+    url: '/chungeng/farmerLogin',
+    method: 'post',
+    data: {code},
+    headers: {
+      isToken: false
+    }
+  })
+}

src/api/onlineHome/homestead/reporting.js

@@ -100,3 +100,12 @@ export function getJg(id){
     method:'get'
   })
 }
+
+// 查询任务上报列表
+export function listHomeuseshangbao(query) {
+  return request({
+    url: '/home/homeuseshangbao/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/sunVillage_info/fixedAssets.js

@@ -747,7 +747,7 @@ export function getMultiplelotsNh(query, id) {
 // 标段合同乙方签字
 export function multipleLotsSecondSign(data, id) {
   return request({
-    url: '/transaction/multiplelotsnh/secondSign/' + id,
+    url: '/home/mobile/multiplelotsnh/secondSign/' + id,
     method: 'post',
     data: data
   })
@@ -765,7 +765,7 @@ export function listCbht(query) {
 // 承包合同甲方签名
 export function cbhtFirstSign(data,id) {
   return request({
-    url: '/service/cbht/sign/first/' + id,
+    url: '/home/mobile/cbht/sign/first/' + id,
     method: 'post',
     data: data
   })
@@ -774,7 +774,7 @@ export function cbhtFirstSign(data,id) {
 // 查询承包合同详细
 export function getCbht(query, id) {
   return request({
-    url: '/service/cbht/get/' + id,
+    url: '/home/mobile/cbht/get/' + id,
     method: 'get',
     params: query
   })
@@ -800,8 +800,44 @@ export function getCbhtList(query) {
 // 承包合同乙方签名
 export function cbhtSecondSign(data,id) {
   return request({
-    url: '/service/cbht/sign/second/' + id,
+    url: '/home/mobile/cbht/sign/second/' + id,
     method: 'post',
     data: data
   })
 }
+
+// 附件查询
+export function attachmentQuery(query) {
+  return request({
+    url: '/home/mobile/attach/query',
+    method: 'get',
+    params: query
+  })
+}
+
+// 附件删除
+export function attachmentRemove(ids) {
+  return request({
+    url: '/home/mobile/attach/remove/' + ids,
+    method: 'get'
+  })
+}
+
+// 附件上传
+export function attachmentUpload(data) {
+  return request({
+    url: '/home/mobile/common/attach',
+    method: 'post',
+    header: { "Content-Type": 'application/x-www-form-urlencoded' },
+    data: data
+  })
+}
+
+// 投诉建议列表
+export function adviceList(query) {
+  return request({
+    url: '/villageAffairs/public/adviceList',
+    method: 'get',
+    params: query
+  })
+}

src/components/form/FieldCascader.vue

@@ -54,6 +54,7 @@ export default {
     'parentName', // 父的值键名 String 如果不为空 则自动转数组为树树结构数组 String
     'showTextAndValue', // 是否显示值和键 Bool|String 字符串为分隔符, true为空字符串
     'showHasChildren', // 是否显示存在子级的标识 Bool|String 字符串为标识符, true为` >`
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -121,6 +122,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.valueName ? data[this.valueName] : data;

src/components/form/FieldDatePicker.vue

@@ -44,6 +44,7 @@ export default {
     'name', 'readonly', 'value', 'label', 'placeholder', 'required', 'rules', 'labelWidth',
     'type', // 类型, 仅支持 datetime date time year-month month-day datehour
     'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -108,6 +109,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     onChanged(data) {
       this.$emit('change', this.getValue(data), data);

src/components/form/FieldSelect.vue

@@ -45,6 +45,7 @@ export default {
     'dataKey', // 值键名 String
     'remoteUrl', // 远程列表加载地址 String
     'onRemoteResponse', // 远程获取到结果的处理回调 String|Function 如果是函数需返回数组, 如果是字符串支持.分割
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -102,6 +103,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.dataKey ? data[this.dataKey] : data;

src/permission.js

@@ -19,6 +19,8 @@ const whiteList = [
   '/notice/inviteTendersDetail',
   '/notice/winTheBiddingDetail',
   '/project/projectNeedsDetail',
+  '/chungeng/userSSOLogin',
+  '/chungeng/farmerSSOLogin',
 
   '/supply/index',
   '/interaction/index',
@@ -136,6 +138,8 @@ const whiteList = [
   '/sunVillage_info/list_vote',   //详情页
   '/sunVillage_info/list_vote_detail',   //详情页
   '/sunVillage_info/list_vote_form',   //详情页
+  '/sunVillage_info/list_complaint',   //详情页
+  '/sunVillage_info/list_complaint_add',   //详情页
   '/sunVillage_info/homeApplication/applicationList',   //列表页面
   '/sunVillage_info/proposerLite',
   '/sunVillage_info/paidExit/paidExitList',   //列表页面
@@ -149,6 +153,10 @@ const whiteList = [
   '/sunVillage_info/list_signature',
   '/sunVillage_info/list_official',
   '/sunVillage_info/list_signature_add',
+  '/sunVillage_info/list_multipleLotsNh',
+  '/sunVillage_info/list_multipleLotsNh_detail',
+  '/sunVillage_info/list_cbf',
+  '/sunVillage_info/list_cbht_detail',
 
   // 新型经营主体
   'newBusinessEntity/newsBulletin', //新闻公告

src/router/index.js

@@ -3335,6 +3335,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/zjdLogin'], resolve)
   },
+  {
+    path: '/chungeng/userSSOLogin',
+    name: 'chungengUserSSOLogin',
+    meta: {
+      title: '春耕App用户登录入口',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/chungengUserSSOLogin'], resolve)
+  },
+  {
+    path: '/chungeng/farmerSSOLogin',
+    name: 'chungengFarmerSSOLogin',
+    meta: {
+      title: '春耕App农户登录入口',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/chungengFarmerSSOLogin'], resolve)
+  },
   {
     path: '/onlineHome/arbitrationList',
     name: 'arbitrationList',
@@ -3813,6 +3831,24 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_vote'], resolve)
   },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_complaint',
+    name: 'sunVillageInfoListComplaint',
+    meta: {
+      title: '投诉建议',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_complaint'], resolve)
+  },
+  { ////阳光村务（新）-- 合同信息
+    path: '/sunVillage_info/list_complaint_add',
+    name: 'sunVillageInfoListComplaintAdd',
+    meta: {
+      title: '投诉建议',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_complaint_add'], resolve)
+  },
   { ////阳光村务（新）-- 合同网签
     path: '/sunVillage_info/list_signature',
     name: 'sunVillageInfoListSignature',

src/store/modules/user.js

@@ -1,4 +1,4 @@
-import { login, logout, getInfo, smsLogin } from '@/api/login';
+import {login, logout, getInfo, smsLogin, chungengUserLogin, chungengFarmerLogin} from '@/api/login';
 import { registerOn } from "@/api/register";
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { getSystemAttachmentUrl } from '@/api/system/config'
@@ -171,6 +171,33 @@ const user = {
 
     // 更新用户信息
 
+    // 春耕App用户登录
+    ChungengLogin({ commit }, userInfo) {
+      const code = userInfo.code;
+      return new Promise((resolve, reject) => {
+        chungengUserLogin(code).then(res => {
+          setToken(res.token)
+          commit('SET_TOKEN', res.token)
+          Cookies.set("_Login_url", window.location.href);
+          resolve(res.data)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 春耕App用户登录
+    ChungengFarmerLogin({ commit }, userInfo) {
+      const code = userInfo.code;
+      return new Promise((resolve, reject) => {
+        chungengFarmerLogin(code).then(res => {
+          Cookies.set("user", res.data, { expires: 30 });
+          resolve(res.data)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
   }
 }
 

src/views/biddingHall/index.vue

@@ -94,7 +94,7 @@
           />
         </div>
         <p class="biddingProcess_text">第六步</p>
-        <p class="biddingProcess_text">成家确认</p>
+        <p class="biddingProcess_text">成交确认</p>
       </van-col>
       <van-col span="3">
         <div class="biddingProcess">

src/views/chungengFarmerSSOLogin.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="app-container">
+  </div>
+</template>
+
+<script>
+import {Dialog} from "vant";
+import Cookies from "js-cookie";
+const TEST = 0;
+
+export default {
+  name: "ChungengFarmerSSOLogin",
+  data() {
+    return {
+    };
+  },
+  created() {
+    this.Login();
+  },
+  methods: {
+    GetToken() {
+      if(TEST)
+      {
+        if(!this.$route.query.s)
+          return this.$route.query.s;
+        let name = '6a4634036f90c1985122c4919d8ecb99';
+        let idcard = 'e49446695d1e82935bbc0cc7e440a8f739f2c015dc029dccb15380b896e7f71b';
+        // idcard = '8feee543fdf8c9cdca7928c9b501908b0b353515cbd0da854519651dafea96c8';
+        // name = '6e067f6d57682232cc32096e86487c5e';
+        let ts = '1234567890123';
+        return name + '#' + idcard + '#' + ts;
+      }
+      else
+        return this.$route.query.s;
+    },
+    ShowToast(content, title) {
+      return Dialog.alert({
+        title: title,
+        message: content,
+        theme: 'round-button',
+      });
+    },
+    Login() {
+      let code = this.GetToken();
+      if(!code)
+      {
+        this.ShowToast('请从春耕App进入登录').then(() => {
+          history.back();
+        });
+        return false;
+      }
+      Cookies.set('bookId', '', { expires: 1 });
+      this.$store.dispatch("ChungengFarmerLogin", {code})
+        .then((data) => {
+          Cookies.set('deptId', data.deptId, { expires: 30 });
+          this.$router.push({path:'/sunVillage_info/index_code_rights'});
+        })
+        .catch((error) => {
+          this.ShowToast(error || '春耕App农户登录失败').then(() => {
+            history.back();
+          });
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+</style>

src/views/chungengUserSSOLogin.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="app-container">
+  </div>
+</template>
+
+<script>
+import {Dialog} from "vant";
+const TEST = 0;
+
+export default {
+  name: "ChungengUserSSOLogin",
+  data() {
+    return {
+    };
+  },
+  created() {
+    this.Login();
+  },
+  methods: {
+    GetToken() {
+      if(TEST)
+      {
+        if(!this.$route.query.s)
+          return this.$route.query.s;
+        let phone = '704d238d95b61f8304ce9e9c2d70e0bf';
+        //phone = '525e902f509a7147ad92e602139bd267'
+        let ts = '1234567890123';
+        return phone + '#' + ts;
+      }
+      else
+        return this.$route.query.s;
+    },
+    ShowToast(content, title) {
+      return Dialog.alert({
+        title: title,
+        message: content,
+        theme: 'round-button',
+      });
+    },
+    Login() {
+      let code = this.GetToken();
+      if(!code)
+      {
+        this.ShowToast('请从春耕App进入登录').then(() => {
+          history.back();
+        });
+        return false;
+      }
+      this.$store.dispatch("ChungengLogin", {code})
+        .then(() => {
+          this.$router.push({ path: "/yinnong/doneCompleted/completed" });
+        })
+        .catch((error) => {
+          this.ShowToast(error || '春耕App用户登录失败').then(() => {
+            history.back();
+          });
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+</style>

src/views/project/projectDetail.vue

@@ -11,7 +11,7 @@
       <van-tab title="竞拍信息" title-style="font-size:12px;">
         <van-swipe class="my-swipe" height="235" indicator-color="white" @change="onChange">
           <template v-if="detail.fileUrlList !== undefined &&detail.fileUrlList.length>0">
-            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?global.severApi+item.fileUrl:'../../static/images/zwtp.jpg'" height="235" /></van-swipe-item>
+            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?'/api'+item.fileUrl:'../../static/images/zwtp.jpg'" height="235" /></van-swipe-item>
           </template>
           <template v-else>
             <van-swipe-item><van-image src="../../static/images/zwtp.jpg" height="235" /></van-swipe-item>
@@ -40,7 +40,7 @@
             <van-col span="19" class="money"><span>{{ detail.deposit }}</span> 元</van-col>
           </van-row>
         </div>
-        <div class="lead">
+        <div class="lead" v-if="detail.biddingType == '拍卖' || detail.biddingTimeType == 2">
           <van-row >
             <van-col span="2"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
             <template v-if="biddinglistInformation!=undefined&&biddinglistInformation.length>0">
@@ -74,7 +74,10 @@
             <van-col span="24"><span>阶梯价（加价幅度）：</span>{{ detail.ladderPrice }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>延时周期：</span>2分钟<van-icon name="question" size="15" style="top: 3px;left: 5px;" color="#CDCDCD"/></van-col>
+            <van-col span="24"><span>延时周期：</span>{{timeConfig}}分钟</van-col>
+          </van-row>
+          <van-row>
+            <van-col span="24"><span>延时周期说明：</span>竞价的最后{{timeConfig}}分钟内，任意方出价，距结束时间将延长{{timeConfig}}分钟，直至无人出价为止</van-col>
           </van-row>
         </div>
       </van-tab>
@@ -153,7 +156,7 @@
       <van-tab title="标的物图片" title-style="font-size:12px;">
         <p class="delTitle">标的物图片</p>
         <template v-if="detail.fileUrlList !== undefined &&detail.fileUrlList.length>0">
-          <van-image v-for="(item,index) in detail.fileUrlList" :key="index" :src="item.fileUrl?''+item.fileUrl:'../../static/images/index/detailImg.png'" style="vertical-align: text-top;" />
+          <van-image v-for="(item,index) in detail.fileUrlList" :key="index" :src="item.fileUrl?'/api'+item.fileUrl:'../../static/images/index/detailImg.png'" style="vertical-align: text-top;" />
         </template>
         <template v-else>
           <van-image src="../../static/images/index/detailImg.png" style="vertical-align: text-top;" />
@@ -167,7 +170,8 @@
       <van-tab title="竞价记录" title-style="font-size:12px;">
         <p class="delTitle">竞价记录</p>
         <div class="biddingList">
-          <table width="100%" cellspacing="0">
+          <p v-if="detail.biddingType != '拍卖' && detail.biddingTimeType != 2">友情提示：非拍卖竞价方式下，竞价过程中不显示竞价记录！</p>
+          <table v-else width="100%" cellspacing="0">
             <tr>
               <td>出价人账号</td>
               <td>姓名</td>
@@ -270,7 +274,8 @@ export default {
       price:null,
       userAccount:"",
       userName:"",
-      userId:""
+      userId:"",
+      timeConfig:''
     };
   },
   computed: {
@@ -463,6 +468,7 @@ export default {
         }
       });
       getWebConfig().then(response =>{
+        this.timeConfig = response.data[8].configValue;
         response.data.map(item =>{
           if(item.configKey=="cqjy.website.bidInfo"){
             this.webConfig +=  item.configValue

src/views/sunVillage_info/index_code.vue

@@ -100,6 +100,8 @@
     },
     created() {
 
+      if(this.$route.query.bookId)
+      {
       bookInfo(this.$route.query.bookId).then((res) => {
         if (res.code == 200) {
           Cookies.set("bookName", res.data.bookName, {
@@ -115,6 +117,7 @@
       Cookies.set("bookId", this.$route.query.bookId, {
         expires: 30,
       });
+      }
       Cookies.set("deptId", this.$route.query.deptId, {
         expires: 30,
       });

src/views/sunVillage_info/index_code_rights.vue

@@ -75,12 +75,15 @@
     created() {
       this.deptId = Cookies.get('deptId')
       this.bookId = Cookies.get('bookId')
-      bookInfo(this.bookId).then((res) => {
-        if (res.code == 200) {
-          this.deptName = res.data.deptName;
-          this.bookName = res.data.bookName;
-        }
-      });
+      if(this.bookId)
+      {
+        bookInfo(this.bookId).then((res) => {
+          if (res.code == 200) {
+            this.deptName = res.data.deptName;
+            this.bookName = res.data.bookName;
+          }
+        });
+      }
       if(Cookies.get('user')){
         this.userName = JSON.parse(Cookies.get('user')).memberName
       }
@@ -220,12 +223,17 @@
               display: flex;
               align-items: center;
               justify-content: center;
-              padding-top: 40PX;
+              padding-top: 45PX;
               width: 25%;
-              margin-top: 10PX;
               &:nth-child(3){
                 margin-right: 0;
               }
+              &:nth-child(4n+1){
+                margin-top: 15PX;
+              }
+              &:nth-child(1){
+                margin-top: 0PX;
+              }
               &.n_1{
                 background: url('../../assets/images/sunVillage_info/index_block_1_rights.png') no-repeat center top;
                 background-size: 34.5PX;
@@ -263,7 +271,7 @@
         }
     }
     .footer{
-        position: absolute;
+        margin-top: 15PX;
         bottom: 5.5vh;
         width: 100%;
         font-size: 22px;

src/views/sunVillage_info/list_cbf.vue

@@ -90,17 +90,14 @@
 </template>
 
 <script>
-  import { getCbf, getCbhtList, cbhtSecondSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { getCbf, getCbhtList, cbhtSecondSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
-  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
   import Cookies from "js-cookie";
 
   export default {
     name: "sunVillageInfoListCbf",
-    components: {vueEsign, signatureUploadSignature},
+    components: { vueEsign },
     data() {
       return {
         applicationList: [],
@@ -141,10 +138,12 @@
         $('#canvasTT').css('display', 'none');
       },
       getCbfInfo() {
-        getCbf(JSON.parse(Cookies.get('user')).idcard).then(response => {
-          this.queryParams.cbfbm = response.data.cbfbm;
-          this.getList();
-        });
+        if (Cookies.get('user')) {
+          getCbf(JSON.parse(Cookies.get('user')).idcard).then(response => {
+            this.queryParams.cbfbm = response.data.cbfbm;
+            this.getList();
+          });
+        }
       },
       getList() {
         if (this.queryParams.cbfbm != null) {
@@ -185,7 +184,7 @@
           tableId: id,
           tableName: 't_sys_cbht',
         };
-        attachmentList(queryParams).then(response => {
+        attachmentQuery(queryParams).then(response => {
           response.rows.map(res => {
             // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({
@@ -204,12 +203,15 @@
         params.append("bizPath", "service");
         params.append("fileType", '0');
         params.append("file", file.file);
-        commonAttach(params).then(response => {
+        params.append("userName", JSON.parse(Cookies.get('user')).memberName);
+        attachmentUpload(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){
-        systemAttachment(file.id).then(res => {
+        attachmentRemove(file.id).then(res => {
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },

src/views/sunVillage_info/list_cbht.vue

@@ -95,16 +95,13 @@
 </template>
 
 <script>
-  import { listCbht, cbhtFirstSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { listCbht, cbhtFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
-  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
 
   export default {
     name: "sunVillageInfoListCbht",
-    components: {vueEsign, signatureUploadSignature},
+    components: { vueEsign },
     data() {
       return {
         applicationList: [],
@@ -198,6 +195,8 @@
         params.append("file", file.file);
         commonAttach(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){

src/views/sunVillage_info/list_cbht_detail.vue

@@ -8,7 +8,6 @@
       <van-divider>承包合同合同信息</van-divider>
       <van-field v-model="form.cbhtbm" label="承包合同编码" placeholder="承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.ycbhtbm" label="原承包合同编码" placeholder="原承包合同编码" input-align="right" :border="false"/>
-      <van-field v-model="form.cbhtmc" label="承包合同名称" placeholder="承包合同名称" input-align="right" :border="false"/>
       <van-field v-model="form.cbflx" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false"/>
       <van-field v-model="form.cbfbm" label="承包方编码" placeholder="承包方编码" input-align="right" :border="false"/>
       <van-field v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false"/>

src/views/sunVillage_info/list_complaint.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="home_wrapper">
+    <div
+      class="header_main"
+      :style="`background-image:url(${require('@/assets/images/sunVillage_info/list_head_green.png')})`"
+    >
+      投诉建议
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn" @click="goAdd" v-show="showBtn"></div>
+    </div>
+    <van-list
+      v-model="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="getList"
+    >
+      <van-swipe-cell v-for="(item,index) in applicationList" :key="index" >
+        <van-cell
+          :border="false"
+          :title="item.subjectName"
+          :label="'时间：'+item.startTime.substr(0,10)+' - '+item.endTime.substr(0,10)"
+          center
+          :to="{name: item.isVote || showBtn ? 'sunVillageInfoListVoteDetail':'sunVillageInfoListVoteForm',query:{id:item.id,type:show?'':'code'}}"
+        >
+          <template #right-icon>
+            <p style="color: #1D6FE9">投票</p>
+          </template>
+          <template #icon>
+            <img src="../../assets/images/sunVillage_info/icon_vote.png" style="width: .5rem;margin-right: 2%;">
+          </template>
+        </van-cell>
+        <template #right v-if="showBtn">
+          <div style="background-color: #ee0a24;height: 100%" @click="goRemove(item.id)">删除</div>
+          <div style="background-color: #07c160" @click="goEdit(item.id)">修改</div>
+          <div style="background-color: rgb(255, 166, 62);" v-if="item.status != '3'" @click="goRanking(item.id)">发布</div>
+        </template>
+      </van-swipe-cell>
+    </van-list>
+  </div>
+</template>
+
+<script>
+  import { adviceList , delPoll , publicPoll } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        applicationList:[],
+        loading: false,
+        finished: false,
+        show: false,
+        fileList:[],
+        showBtn:true,
+      };
+    },
+    created() {
+      if (Cookies.get('user')){
+        this.queryParams.userId = JSON.parse(Cookies.get('user')).id
+      }
+    },
+    methods: {
+      getList(){
+        var _this = this;
+        let queryParams = {
+          advicePhone:JSON.parse(Cookies.get('user')).phone
+        }
+        adviceList(queryParams).then(response => {
+          _this.listLength = response.total;
+          response.rows.map(res=>{
+            _this.applicationList.push(res);
+          })
+
+          if(_this.applicationList.length >= response.total){
+            _this.finished = true;
+            return;
+          }else{
+            _this.loading = false;
+            _this.queryParams.pageNum += 1 ;
+          }
+        });
+      },
+      goAdd(){
+        this.$router.push('/sunVillage_info/list_complaint_add')
+      },
+      goDetail(id){
+        this.$router.push({path:'/sunVillage_info/list_vote_detail',query: {id:id}})
+      },
+      goEdit(id){
+        this.$router.push({path:'/sunVillage_info/list_vote_edit',query: {id:id}})
+      },
+      goRanking(id){
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认发布？',
+          showCancelButton:true,
+        })
+          .then(() => {
+            publicPoll(id).then(response => {
+              this.$notify({ type: 'success', message: '发布成功' });
+              this.applicationList = [];
+              this.getList()
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
+      goRemove(id){
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认删除？',
+          showCancelButton:true,
+        })
+          .then(() => {
+            delPoll(id).then(response => {
+              this.$notify({ type: 'success', message: '删除成功' });
+              this.applicationList = [];
+              this.getList()
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main{
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 56.4px;
+        height: 40.8px;
+        background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+        background-size: 47px 34px;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
+    .van-swipe-cell {
+      position: relative;
+      overflow: hidden;
+      cursor: grab;
+      width: 96%;
+      margin: 0 auto;
+      margin-top: 15PX;
+      box-shadow: 5PX 5PX 2PX #ccc;
+      border-radius: 10PX;
+    }
+    /deep/ .van-swipe-cell__right{
+      display: flex;
+      align-items: center;
+      width: 150PX;
+      margin-left: 5PX;
+      a,div{
+        margin: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #ffffff;
+        font-size: 14PX;
+        height: 100%;
+        flex: 1;
+      }
+    }
+  }
+</style>

src/views/sunVillage_info/list_complaint_add.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main">
+      投诉建议
+      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="add_btn"></div>
+    </div>
+
+    <img src="../../assets/images/sunVillage_info/complaint_add_icon_01.jpg" width="100%" alt="">
+
+    <van-form @submit="onSubmit">
+      <div class="list_main">
+
+        <van-field readonly required label="投诉内容" :border="false" />
+
+        <div class="input_field">
+          <van-field
+            v-model="form.subjectName"
+            :rules="[{ required: true , message:'具体说明举报内容' }]"
+            rows="4"
+            autosize
+            type="textarea"
+            maxlength="1000"
+            placeholder="具体说明举报内容"
+            show-word-limit
+            :border="false"
+          />
+        </div>
+
+        <van-field readonly required label="图片线索" :border="false" />
+        <van-uploader />
+
+        <van-field readonly required label="视频线索" :border="false" />
+        <van-uploader />
+
+        <van-field readonly required label="所在区域" :border="false" />
+        <div class="input_field">
+          <van-field v-model="value1" right-icon="arrow-down" placeholder="显示图标" :border="false" />
+        </div>
+
+        <van-field readonly required label="线索地址（具体到村小组）" :border="false" />
+        <div class="input_field">
+          <van-field placeholder="请输入地址" :border="false" />
+        </div>
+
+        <van-field readonly label="投诉人（非必填）" :border="false" />
+        <div class="input_field">
+          <van-field placeholder="请输入姓名" :border="false" />
+        </div>
+
+        <van-field readonly label="联系电话（非必填，我们将对号码保密）" :border="false" />
+        <div class="input_field">
+          <van-field placeholder="请输入电话" :border="false" />
+        </div>
+
+      </div>
+
+      <div style="margin: 16px auto;width: 50%;">
+        <van-button round block type="primary" native-type="submit">
+          保存
+        </van-button>
+      </div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+  import { commonUpload , addPoll } from "@/api/sunVillage_info/fixedAssets";
+  import Cookies from "js-cookie";
+  import request from '@/utils/request'
+  export default {
+    name: "certificateList",
+    data() {
+      return {
+        showStartTime:false,
+        showEndTime:false,
+        form:{
+          startTime:this.format(new Date(),'yyyy-MM-dd HH:mm:ss'),
+          endTime:this.format(new Date(),'yyyy-MM-dd HH:mm:ss'),
+          type:'1',
+          anonymous:'Y',
+          status:'2',
+          options:[{name:''}]
+        },
+        openPic:[],
+        fileList:[],
+        fileList1:[],
+        startTime:new Date(),
+        endTime:new Date(),
+        type:'',
+        openFile:[],
+        openFileList:[],
+        queryParams:{
+          bookId:'',
+          deptId:'',
+        },
+        openFile2:[],
+        openPic2:[],
+        value1:''
+      };
+    },
+    created() {
+      this.queryParams.bookId = Cookies.get('bookId');
+      this.queryParams.deptId = Cookies.get('deptId');
+    },
+    methods: {
+      addOptions(){
+        var that = this;
+        let array = that.form.options.filter(function (e) { return e.name == ""; });
+        console.log(array);
+        if (array.length>0){
+          that.$toast('请勿添加多个空选项！');
+        }else{
+          that.form.options.push({name:''})
+        }
+      },
+      onSubmit(){
+        var that = this;
+        addPoll(that.form).then((r1) => {
+          if (r1.code == 200){
+            that.$notify({ type: 'success', message: '新增成功' });
+            setTimeout(function(){
+              history.back(-1);
+            },2000)
+          }
+        })
+      },
+      onConfirmOpenNy(data){
+        this.form.startTime = this.format(data,'yyyy-MM-dd HH:mm:ss');
+        this.startTime = data;
+        this.showStartTime = false;
+      },
+      onConfirmOpenEndTime(data){
+        this.form.endTime = this.format(data,'yyyy-MM-dd HH:mm:ss');
+        this.endTime = data;
+        this.showEndTime = false;
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+  .van-radio:last-child{
+    margin-right: 0;
+  }
+  .input_field{
+    border: 1px solid #d8d8d8;
+    padding: 5px 15px;
+    border-radius: 8PX;
+    margin: 10PX 0;
+  }
+  .home_wrapper{
+    background: #f1f2f2;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head_green.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .list_main{
+      padding: 75px 25px 25px;
+      background: #ffffff url("../../assets/images/sunVillage_info/complaint_add_icon_02.jpg") no-repeat center top;
+      background-size: auto 75px;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .tit{
+      font-size: 16PX;
+      padding: 15PX 10PX;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+      line-height: 1;
+      &:nth-child(1){
+        padding-top: 0;
+      }
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: auto;
+      display: flex;
+      align-items: center;
+      border-left: 4PX solid #2ec6a9;
+    }
+    /deep/ .van-cell--required::before{
+      left: 22%;
+    }
+    /deep/ .van-field__error-message{
+      display: none;
+    }
+  }
+</style>

src/views/sunVillage_info/list_multipleLots.vue

@@ -86,16 +86,13 @@
 </template>
 
 <script>
-  import { listMultiplelots, multipleLotsFirstSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { listMultiplelots, multipleLotsFirstSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
-  import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
 
   export default {
     name: "sunVillageInfoListMultipleLots",
-    components: {vueEsign, signatureUploadSignature},
+    components: { vueEsign },
     data() {
       return {
         applicationList: [],
@@ -189,6 +186,8 @@
         params.append("file", file.file);
         commonAttach(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){

src/views/sunVillage_info/list_multipleLotsNh.vue

@@ -81,9 +81,7 @@
 </template>
 
 <script>
-  import { listMultipleLotsNh, multipleLotsSecondSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { listMultipleLotsNh, multipleLotsSecondSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";
@@ -162,7 +160,7 @@
           tableId: id,
           tableName: 't_transaction_multiplelotsnh',
         };
-        attachmentList(queryParams).then(response => {
+        attachmentQuery(queryParams).then(response => {
           response.rows.map(res => {
             // let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
             this.fileList.push({
@@ -181,12 +179,15 @@
         params.append("bizPath", "transaction");
         params.append("fileType", '0');
         params.append("file", file.file);
-        commonAttach(params).then(response => {
+        params.append("userName", JSON.parse(Cookies.get('user')).memberName);
+        attachmentUpload(params).then(response => {
           this.$notify({ type: 'success', message: '上传成功' });
+          let newFile = this.fileList[this.fileList.length - 1];
+          this.$set(newFile, 'id', response.id);
         });
       },
       deleteFile(file){
-        systemAttachment(file.id).then(res => {
+        attachmentRemove(file.id).then(res => {
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },

src/views/sunVillage_info/login_code.vue

@@ -122,7 +122,11 @@
           checkFarmer(this.formData).then(response => {
             // console.log(response.data)
             if (response.code == 200){
-              Cookies.set("user", response.data, { expires: 30 });
+              let seconds = 3600;
+
+              let expires = new Date(new Date() * 1 + seconds * 1000);
+
+              Cookies.set("user", response.data, { expires: expires });
               this.$router.push({path:'/sunVillage_info/index_code_rights'})
             }
           });

src/views/sunVillage_info/statistical_report_edit.vue

@@ -55,14 +55,14 @@
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
                                     <div class="planting_flex">
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
 
@@ -73,14 +73,14 @@
                             <div class="type_project">各类合作社总数各类合</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
                         <div class="industry_list">
                             <div class="type_project">牧业</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
 
@@ -100,14 +100,14 @@
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
                                     <div class="planting_flex">
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
 
@@ -118,14 +118,14 @@
                             <div class="type_project">各类合作社总数各类合</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
                         <div class="industry_list">
                             <div class="type_project">牧业</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
 
@@ -158,12 +158,12 @@
                                             <div class="subclass">{{val.projectName}}</div>
                                             <div class="unit_munt">{{val.measuringUnit}}</div>
                                             <div class="number_value">
-                                                <!-- <van-stepper v-model="val.currentYearNumber"   min="0"/> 
+                                                <!-- <van-stepper v-model="val.currentYearNumber"   min="0"/>
                                                 <input type=""> -->
                                                 <van-field v-model="val.currentYearNumber" type="number" />
                                             </div>
                                         </div>
-                               
+
 
                                     </div>
                                 </div>
@@ -179,11 +179,11 @@
 
 
                         </div>
-           
+
 
                     </div>
                 </div>
-                
+
             </div>
         </div>
 
@@ -246,8 +246,8 @@ export default {
             updateBy:null,
             updateTime:null,
             templateName:null,  //模板名称
-            declarationTypeId:null, //申报类型 1 
-            principalName:null, //单位负责人  1 
+            declarationTypeId:null, //申报类型 1
+            principalName:null, //单位负责人  1
             preparer:null, //填表人  1
             preparerDeptName:'', //填报单位 1
             time:this.format(new Date(),'yyyy-MM-dd'), //填报时间
@@ -276,9 +276,9 @@ export default {
             value: 'dictValue',
             children: 'children',
         }
-        
-        
-  
+
+
+
     };
   },
   created() {
@@ -291,7 +291,7 @@ export default {
             this.declarationTypeValue = content[0].dictLabel;
         }
 
- 
+
     });
   },
   mounted(){
@@ -305,7 +305,7 @@ export default {
         //編輯
         let oId = this.$route.query.id;
         entityStatisticsDetail(oId).then((res)=>{
-         
+
             if(res.code == 200){
                 let content = res.data;
                 // let obj = {
@@ -326,8 +326,8 @@ export default {
                 //     updateBy:content.updateBy,
                 //     updateTime:content.updateTime,
                 //     templateName:content.templateName,  //模板名称
-                //     declarationTypeId:content.declarationTypeId, //申报类型 1 
-                //     principalName:content.principalName, //单位负责人  1 
+                //     declarationTypeId:content.declarationTypeId, //申报类型 1
+                //     principalName:content.principalName, //单位负责人  1
                 //     preparer:content.preparer, //填表人  1
                 //     preparerDeptName:content.preparerDeptName, //填报单位 1
                 //     time:content.time,
@@ -349,11 +349,11 @@ export default {
                 this.from = res.data;
             }
 
-            
+
         })
     }
 
-    this.getDicts("newBusinessEntity_statistics_project").then(res => {
+    this.getDicts("statistics_template_type").then(res => {
         if(res.code == 200){
             let content = res.data;
             content.forEach((v)=>{
@@ -362,7 +362,7 @@ export default {
             this.statisticsProject = content;
         }
     });
-   
+
   },
   methods: {
     projectOnFinish(data){
@@ -380,7 +380,7 @@ export default {
         if(value.tabIndex == 0){
            //查看
             entityStatisticsTemplate({statisticsTypeId:value.selectedOptions[0].dictValue}).then((response)=>{
-                if(response.code == 200){ 
+                if(response.code == 200){
                     let content = response.data;
 
                     this.statisticsProject[Number(value.value)-1].children = content.map(item => {
@@ -396,9 +396,9 @@ export default {
                             })
                         }
                         recursionFileMap(item.tEntityStatisticsNumberList)
-             
-                        return { 
-                            dictLabel:item.templateName, 
+
+                        return {
+                            dictLabel:item.templateName,
                             dictValue: item.templateId,
                             templateForm:item,
                             // templateForm:{
@@ -423,7 +423,7 @@ export default {
                 message:'请选择模板!',
                 type: 'danger'
             });
-    
+
             return false;
         }else if(this.from.declarationTypeId == null){
             this.$notify({
@@ -448,7 +448,7 @@ export default {
                     this.$router.push('/sunVillage_info/statistical_report')
                 },1500)
             }
-            
+
         })
     },
     typeDeclarationClick(){
@@ -465,7 +465,7 @@ export default {
     templateClick(){
         this.popObj.templateVisbile = true;
     }
-  
+
   },
 }
 </script>
@@ -499,7 +499,7 @@ export default {
            top: 36px;
        }
 
-    
+
    }
    .template_main{
         padding:30px 24px 0;
@@ -535,7 +535,7 @@ export default {
             align-items: center;
             justify-content: space-between;
 
-         
+
             .title{
                 width: 465px;
                 height: 64px;
@@ -553,7 +553,7 @@ export default {
                 background-size: 100% 100%;
             }
 
-            
+
         }
    }
    .choose_main{
@@ -605,7 +605,7 @@ export default {
                 }
             }
         }
-        
+
    }
    .table_main{
         padding:0px  24px 0 24px;
@@ -701,11 +701,11 @@ export default {
                            .van-cell {
                                 padding:20px 16px;
                                 background: none;
-                            
+
                            }
-                           
-                            
-                        
+
+
+
                         }
 
 
@@ -782,7 +782,7 @@ export default {
 
 
                     }
-                  
+
                 }
             }
         }

src/views/yinnong/homestead/supervision/supervisionAdd.vue

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">
@@ -98,7 +108,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs } from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -122,7 +132,9 @@
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
         deptId:this.$store.state.user.loginDeptId,
-        jgList:{},
+        jgList:{
+          shangbaoId: null,
+        },
         getObligeeOptions:[],
         sfzjjzw:'',
         jglx:'',
@@ -131,11 +143,12 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
+      this.getShangbaoList();
     },
     methods: {
       getDictionaries(){
@@ -273,7 +286,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

src/views/yinnong/homestead/supervision/supervisionCloseCase.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <field-select
           v-model="jgList.jglx"
           label="监管类型"

src/views/yinnong/homestead/supervision/supervisionDetail.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
       </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">

src/views/yinnong/homestead/supervision/supervisionModify.vue

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
     <p class="main_title">执法情况</p>
     <field-select
@@ -138,7 +148,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs,getJg,jgEdit} from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, getJg, jgEdit, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -171,12 +181,13 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
       this.getTaskGet();
+      this.getShangbaoList();
     },
     methods: {
       getTaskGet(){
@@ -316,7 +327,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

src/views/yinnong/homestead/supervision/supervisionWfxx.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <p class="main_title">违法信息</p>
         <div class="main_box">
           <van-field

打包.bat

@@ -1,14 +1,21 @@
 @echo off
 
-D:
-cd D:\workspace\code\nsgk_mobile
+@echo 开始打包App......
 
+call :extract %0
+goto :eof
+:extract
 
+rem 进入项目根目录
+@echo 进入项目根目录: %~dp1
+%~d1
+cd %~dp1
 
+call npm run build
 
-:: 鎵撳寘棰勫彂甯冪幆澧�
-npm run build
+@echo 打包成功
 
+@echo 打开目标文件夹
+start "" %~dp1
 
-@echo SUCCESS
-pause
+@pause