fix:bug修改

src/views/dataReport/intakeWaterAnalysis.vue

@@ -65,11 +65,16 @@ import { assign, omit } from 'lodash-es';
 
 export default {
   name:"waterManage",
-  components: { BTable,DataReportLeft},
+  components: { BTable, DataReportLeft },
+  mounted() { 
+    this.setYear()
+  },
   data() {
+    let date = new Date()
+    let currentYear = date.getFullYear()
     return {
       activeName:'first',
-      currentYear: '',
+      currentYear,
       loading: false,
       associationManageShow: false,
       treeData: [],
@@ -96,7 +101,7 @@ export default {
           align: 'center'
         },
         {
-          label: '面积',
+          label: '面积（亩）',
           prop: 'waterrightAreasize',
           customRender: '',
           align: 'center'
@@ -127,7 +132,6 @@ export default {
       this.$refs.tableRef.refresh(true);
     },
     async loadData(parameter) {
-      this.setYear()
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -163,7 +167,7 @@ export default {
     },
     setYear() {
       this.options = []
-      let date = new Date
+      let date = new Date()
       let currentYear = date.getFullYear()
       this.currentYear = currentYear
       for (let i = 0; i < 5; i++) {

src/views/dataReport/saveWaterAnalysis.vue

@@ -14,7 +14,7 @@
               </el-option>
             </el-select>
             <el-input style="width: 250px;margin-right: 16px;"
-              placeholder="请输入农户编号/姓名/电话"
+              placeholder="请输入姓名/电话"
               v-model="keyword"
             />
             <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
@@ -45,10 +45,15 @@ import { assign, omit } from 'lodash-es';
 export default {
   name: "waterManage",
   components: { BTable, DataReportLeft },
+  mounted() { 
+    this.setYear()
+  },
   data() {
+    let date = new Date()
+    let currentYear = date.getFullYear()
     return {
       activeName: 'first',
-      currentYear: '',
+      currentYear,
       keyword: '',
       loading: false,
       associationManageShow: false,
@@ -111,7 +116,6 @@ export default {
       this.$refs.tableRef.refresh(true);
     },
     async loadData(parameter) {
-      this.setYear()
       if (!this.currentClickId) {
         const treeList = this.$store.state.tree.treeList
         let res = []
@@ -135,7 +139,7 @@ export default {
     },
     setYear() {
       this.options = []
-      let date = new Date
+      let date = new Date()
       let currentYear = date.getFullYear()
       this.currentYear = currentYear
       for (let i = 0; i < 5; i++) {

src/views/infrastructure/components/waterPriceSetting.vue

@@ -117,8 +117,8 @@ export default {
       this.currentYear = currentYear
       for (let i = 0; i < 5; i++) {
         this.options.push({
-          label: currentYear - i,
-          value: currentYear - i
+          label: currentYear + i,
+          value: currentYear + i
         })
       }
     },

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -160,6 +160,7 @@
 </template>
 
 <script>
+import { Message } from 'element-ui'
 import { isValidIDCard, checkPhone } from '@/utils/index.js'
 import SelectTree from '@/components/SelectTree';
 import { addFarmer,editFarmer, getAreaInfo } from '@/api/farmer/list.js'
@@ -203,6 +204,7 @@ export default {
       yieldPer: '0',
       residualWaterRight: '0',
       areasizeResidue: '0',
+      currentItem: {},
       rules: {
         areaId: [
           { required: true, message: '请选择所属区域', trigger: 'blur' }
@@ -265,7 +267,8 @@ export default {
               if (+value < 0) { callback(new Error('水权不能为负数')); return }
               if (isNaN(value)) { callback(new Error('请正确输入您的水权')); return }
               if (this.isEdit) {
-                if (+value > (+this.residualWaterRight) + (+this.editFarmerData.farmerWrbalance)) {
+                if (+value > (+this.residualWaterRight) + (+this.editFarmerData.farmerWramount)) {
+                  console.log(22222 , (+this.residualWaterRight) , (+this.editFarmerData.farmerWramount))
                   callback(new Error('输入的水权不能大于剩余水权'))
                   return
                 } else { 
@@ -349,6 +352,7 @@ export default {
         waterrightYear: new Date().getFullYear(),
         areaId: item.areaId
       })
+      this.currentItem = item
       const value = res?.data
       this.cusareaName = item?.cusareaName
       const areaId = item?.areaId || ''
@@ -361,6 +365,10 @@ export default {
       this.cusareaName = ''
     },
     async handlerAddFarmer() {
+      if (this.currentItem?.children?.length > 0) {
+        Message.warning('请选择最小行政区块')
+        return
+       }
       if(!this.isEdit){
         const res = await addFarmer(this.baseForm)
         if(res?.code === "000000") {

src/views/waterMarket/component/waterDeal.vue

@@ -209,6 +209,8 @@ export default {
               if (!value) callback(new Error('请输入您的交易价格'));
               if (value <= 0) {
                 callback(new Error('请正确输入您的交易价格'));
+              } else if (value > this.sellerRow.farmerWrbalance) { 
+                callback(new Error('交易水量不能大于可用水权'));
               } else {
                 callback()
               }

src/views/waterMarket/index.vue

@@ -156,7 +156,9 @@ export default {
   },
   methods: {
     async getFarmerListHandler() {
-      const res = await getFarmerList()
+      const res = await getFarmerList({
+        pageSize: 99999
+      })
       this.farmerList = res.data
     },
     changeRoleType(type) {
@@ -192,6 +194,7 @@ export default {
     },
     handleSearch() {
       this.$refs.tableRef.refresh(true);
+      this.getFarmerListHandler()
     },
     goDetail(row) {
       this.$refs.sourceCodeDetail.open(row.tarcecodeapplyBatchno)