fix: bug修改

src/components/SelectTree/index.vue

@@ -53,15 +53,19 @@ export default {
       defaultChecked: []
     }
   },
-  mounted() { 
-    this.defaultChecked = this.checkedList.split(',')
-  },
   watch: {
     checkVal: {
       handler(val) {
         this.node.cusareaName = val
       }
     },
+    checkedList: {
+      handler(val) {
+        this.defaultChecked = val ? val.split(',') : []
+      },
+      deep: true,
+      immediate: true
+    }
   },
   methods: {
     //点击节点

src/utils/index.js

@@ -452,3 +452,11 @@ export const isValidIDCard = (idCard) => {
 export const checkPhone = (phone) => {
   return /^1\d{10}$/.test(phone);
 };
+// 富文本编辑器的删除完全
+export const checkEmpty = (str) => {
+  let res = str.replace(/<p>/g, '');
+  res = res.replace(/<\/p>/g, '');
+  res = res.replace(/&nbsp;/g, '');
+  res = res.replace(/<br>/g, '');
+  return res.trim() == '';
+};

src/views/infrastructure/components/ladderLikeWaterPrice.vue

@@ -22,12 +22,18 @@
                   @change="(val) => changeMaxHandler(val,index)"
                 />
               </el-col>
-              <el-col :span="2">
+              <el-col :span="2" v-if="type == 'water'">
                 <span style="margin:0 10px;">吨</span>
               </el-col>
-              <el-col :span="8" style="display:flex">
+              <el-col :span="2" v-else>
+                <span style="margin:0 10px;">度</span>
+              </el-col>
+              <el-col :span="8" style="display:flex" v-if="type == 'water'">
                 <el-input type="number" v-model="item.pricestepUnitprice" style="width: 50%;margin-right:10px;"/>元/吨
               </el-col>
+              <el-col :span="8" style="display:flex" v-else>
+                <el-input type="number" v-model="item.pricestepUnitprice" style="width: 50%;margin-right:10px;"/>元/度
+              </el-col>
               <el-col :span="2" v-if="index + 1 == list.length && list.length > 2">
                 <span style="margin: 0 10px;">
                   <i class="el-icon-delete-solid delete-icon" @click="() => handlerDeleteIcon(index)"></i>

src/views/infrastructure/components/recompose.vue

@@ -45,6 +45,8 @@
         <el-form-item label="面积：" prop="area">
           <el-input
             placeholder="请输入"
+            type="number"
+            :max="Number(infoData.areasizeResidue || 0)"
             v-model="baseForm.area"
             style="width:250px;"
           >
@@ -55,8 +57,10 @@
       <el-row>
         <el-form-item label="额定水权：" prop="ratedWater">
           <el-input
+            type="number"
             placeholder="请输入"
             style="width:250px;"
+            :max="Number(infoData.waterrightAmount || 0)"
             v-model="baseForm.ratedWater">
           </el-input>
           <span style="margin-left:5px">m³ </span>
@@ -130,10 +134,26 @@ export default {
       hasFetched: false,
       rules: {
         area: [
-          { required: true, message: '请输入面积', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+              if (!value) { callback(new Error('请输入面积')); return }
+              if (isNaN(value)) callback(new Error('请正确输入您的面积'))
+              else if (value > this.infoData.areasizeResidue) {
+                callback(new Error('输入的面积不能大于总面积'))
+              } else {
+                callback()
+              }
+            }, trigger: 'blur' }
         ],
         ratedWater: [
-          { required: true, message: '请输入额定水权', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+            if (!value) {  callback(new Error('请输入额定水权'));  return}
+            if(isNaN(value)) callback(new Error('请正确输入您的额定水权'))
+            else if (value > this.infoData.waterrightAmount) {
+              callback(new Error('输入的额定水权不能大于总额定水权'))
+            } else { 
+              callback()
+            }
+          },  trigger: 'blur' }
         ]
       }
     };

src/views/infrastructure/components/setAnnualWaterRight.vue

@@ -62,6 +62,7 @@
                 type="number"
                 v-model="baseForm.priceconfigWaterunitprice"
               />
+              <span style="display:inline-block;margin-left:5px">元/吨</span>
             </el-col>
           </el-row>
         </el-form-item>

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -186,13 +186,16 @@ export default {
     isEdit:{
       type: Boolean,
       default: false
+    },
+    currentClickId: {
+      type: Number | String
     }
   },
   data() {
     return {
       dialogSubmitLoading: false,
       dialogVisible: false,
-      baseForm: this.editFarmerData,
+      baseForm: { ...this.editFarmerData },
       hasFetched: false,
       cusareaName: '',
       areaAll: '0',
@@ -208,7 +211,7 @@ export default {
         ],
         farmerIdcard: [
           {
-            required: true, validator: (rule, value, callback) => { 
+            required: true, validator: (rule, value, callback) => {
               if (!value) callback(new Error('请输入农户身份证号'));
               const vaild = isValidIDCard(value)
               if (vaild) {
@@ -232,10 +235,27 @@ export default {
             },  trigger: 'blur' }
         ],
         farmerAreasize: [
-          { required: true, message: '请输入土地面积', trigger: 'blur' }
+          {
+            required: true, validator: (rule, value, callback) => {
+              if (!value) { callback(new Error('请输入土地面积')); return }
+              if (isNaN(value)) callback(new Error('请正确输入您的土地面积'))
+              else if (value > this.areaAll) {
+                callback(new Error('输入的土地面积不能大于总面积'))
+              } else {
+                callback()
+              }
+            }, trigger: 'blur' }
         ],
         farmerWramount: [
-          { required: true, message: '请输入水权', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+              if (!value) { callback(new Error('请输入水权')); return }
+              if (isNaN(value)) callback(new Error('请正确输入您的水权'))
+              else if (value > this.residualWaterRight) {
+                callback(new Error('输入的水权不能大于剩余水权'))
+              } else {
+                callback()
+              }
+            }, trigger: 'blur' }
         ]
       }
     };
@@ -254,19 +274,26 @@ export default {
     },
     editFarmerData: {
       handler(val) {
-        this.baseForm = val
+        this.baseForm = {...val }
         this.cusareaName = val.cusareaName
       },
       deep: true
     },
     treeData: {
-      handler(val) {
-        console.log(val,'valjkvksaljvksjskvc')
-       },
+      handler(val) { 
+        const value = this.findItemByAreaId(this.currentClickId, val)
+        this.areaAll = value?.waterrightAreasize
+        this.waterRightAll = value?.waterrightAmount
+        this.yieldPer = value?.waterrightAmount == 0 ? 0 : (value?.waterrightAreasize) / (value?.waterrightAmount)
+        this.residualWaterRight = value?.amountResidue ?? 0
+      },
       deep: true
-     }
+    }
   },
   methods: {
+    findItemByAreaId(areaId,list) {
+      return list.find(item => item.areaId === areaId)
+    },
     handlerClick(value) {
       this.baseForm.areaId = value?.areaId
       this.areaAll = value?.waterrightAreasize

src/views/peasantHouseholdManage/index.vue

@@ -120,6 +120,7 @@
     :treeData="treeDatas"
     :editFarmerData="editFarmerData"
     :isEdit="isEdit"
+    :currentClickId="currentClickId"
     @refresh="handleSearch"
   />
   <farmer-management 
@@ -253,7 +254,7 @@ export default {
       })
       this.detailsData = res?.data
     },
-    async getWaterrighTreetList() {
+    async getWaterrighTreetList(currentClickId) {
       const date = new Date()
       const waterrightYear = date.getFullYear()
       const res = await getWaterrightList({
@@ -271,10 +272,10 @@ export default {
           res = await getTree()
           this.$store.dispatch('tree/setTree', res)
         }
-        this.getWaterrighTreetList()
         this.treeData = res?.data
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
+        this.getWaterrighTreetList(this.currentClickId)
       }
       const params = {
         farmerName: this.farmerName,

src/views/waterManage/component/associationManage.vue

@@ -36,14 +36,14 @@
             <el-row :gutter="5">
               <el-col :span="23">
                 <select-tree
+                  v-if="dialogVisible"
                   style="width: 100%"
                   :treeData="treeData"
                   :placeholder="'请输入产品名称/批次号'"
-                  @handlerClick="handlerClick"
                   @getCheckTree="getCheckTreeHandler"
                   @getCheckTreeNode="getCheckTreeNodeHandler"
                   :checkVal="cusareaName"
-                  :checkedList="areaIds"
+                  :checkedList="allAreaIds"
                   checkbox
                   v-model="baseForm.areaIds"
                 ></select-tree>
@@ -94,7 +94,7 @@
                   type="textarea"
                   :autosize="{ minRows: 4}"
                   placeholder="请输入协会介绍"
-                  maxlength="500"
+                  maxlength="250"
                   show-word-limit
                   v-model="baseForm.assocRemark" />
               </el-col>
@@ -168,12 +168,12 @@ export default {
         assocRemark: '',
         areaIds: []
       },
-      areaIds: '',
+      allAreaIds: '',
       syinfoList: [],
       hasFetched: false,
       rules: {
-        assocManageid: [
-          { required: true, message: '请选择负责人', trigger: 'blur' }
+         assocManageid: [
+          { required: true, message: '请选择负责人', trigger: 'change' }
         ],
         assocName: [
           { required: true, message: '请输入您的协会名称', trigger: 'blur' }
@@ -182,7 +182,13 @@ export default {
           { required: true, message: '请输入您的协会介绍', trigger: 'blur' }
         ],
         areaIds: [
-          { required: true, message: '请输入您的管辖范围', trigger: 'blur' }
+          {
+            required: true, validator: (rule, value, callback) => {
+              if (!value) { callback(new Error('请输入您的管辖范围')) }
+              else { 
+                callback()
+              };
+            }, trigger: 'change' }
         ],
       }
     };
@@ -211,7 +217,7 @@ export default {
         this.baseForm.assocRemark = val.assocRemark
         this.baseForm.assocManageid = val.assocManageid
         this.baseForm.areaIds = val.areaIds
-        this.areaIds = val.areaIds
+        this.allAreaIds = val.areaIds
         const treeNodeList = val?.cusareaNames?.split(',') || []
         this.cusareaName = treeNodeList[treeNodeList.length - 1]
         this.treeNodeList = treeNodeList
@@ -226,10 +232,10 @@ export default {
     getCheckTreeNodeHandler(val) { 
       this.treeNodeList = val
     },
-    handlerClick() { },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
+    resetForm() {
       this.dialogVisible = false;
+      this.cusareaName = ''
+      this.$refs.baseForm.resetFields();
     },
     resetFormData() {
       this.baseForm = {
@@ -254,7 +260,6 @@ export default {
       }
       this.handleClose()
       this.$emit('getList')
-      this.resetFormData()
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -263,6 +268,7 @@ export default {
     },
     handleClose() {
       this.$emit('update:visible', false);
+      // this.resetFormData()
       this.resetForm('baseForm');
     },
   }

src/views/waterMarket/component/waterDeal.vue

@@ -97,26 +97,28 @@
                 min="0"
                 :max="sellerRow.farmerWrbalance"
                 v-model="baseForm.trxrcdNum"
+                @input="trxrcdNumInput"
                 style="width: 150px"
               />
             </el-form-item>
           </div>
-          <div style="display:flex;align-items:center;margin-top: 10px">
+          <div style="display:flex;align-items:center;margin-top: 20px">
             <el-form-item label="交易价格：" prop="trxrcdPrice" style="margin:0;padding:0">
               <el-input
                 type="number"
                 min="0"
                 v-model="baseForm.trxrcdPrice"
+                @input="trxrcdPriceInput"
                 style="width: 150px"
               />
             </el-form-item>
           </div>
-          <div style="display:flex;align-items:center;margin-top: 10px">
+          <div style="display:flex;align-items:center;margin-top: 20px">
             <el-form-item label="交易金额："  style="margin:0;padding:0">
               {{ (Number(baseForm.trxrcdNum) * Number(baseForm.trxrcdPrice)).toFixed(2) }}
             </el-form-item>
           </div>
-          <div style="text-align:right;margin-top:50px">
+          <div style="text-align:right;margin-top:30px">
             <el-button type="info" plain @click="resetForm('baseForm')"
             >取消</el-button
           >
@@ -170,16 +172,30 @@ export default {
       },
       rules: {
         trxrcdSellerid: [
-          { required: true, message: '请选择您的卖方用水户', trigger: 'blur' }
+          { required: true, message: '请选择您的卖方用水户', trigger: 'change' }
         ],
         trxrcdBuyerid: [
-          { required: true, message: '请选择您的买方用水户', trigger: 'blur' }
+          { required: true, message: '请选择您的买方用水户', trigger: 'change' }
         ],
         trxrcdPrice: [
-          { required: true, message: '请输入您的交易水量', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+              if (!value) callback(new Error('请输入您的交易水量'));
+              if (value <= 0) {
+                callback(new Error('请正确输入您的交易水量'));
+              } else {
+                callback()
+              }
+            },  trigger: 'blur' }
         ],
         trxrcdNum: [
-          { required: true, message: '请输入您的交易价格', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+              if (!value) callback(new Error('请输入您的交易价格'));
+              if (value <= 0) {
+                callback(new Error('请正确输入您的交易价格'));
+              } else {
+                callback()
+              }
+            }, trigger: 'blur' }
         ]
       }
     };
@@ -198,6 +214,22 @@ export default {
     },
   },
   methods: {
+    trxrcdNumInput(value) {
+      if(isNaN(value))return false
+      this.baseForm.trxrcdNum = this.setRule(value)
+    },
+    trxrcdPriceInput(value) { 
+      if (isNaN(value)) return false
+      this.baseForm.trxrcdPrice = this.setRule(value)
+    },
+    setRule(value) {
+      value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符
+      value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符
+      value = value.replace(/\.{2,}/g, "."); //只保留第一个.清除多余的
+      value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+      value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
+      return value
+    },
     async addTrxrcdHandler() {
       const params = { ...this.baseForm }
       params.trxrcdMoney = Number(this.baseForm.trxrcdNum) * Number(this.baseForm.trxrcdPrice)
@@ -220,6 +252,13 @@ export default {
      },
     resetForm(formName) {
       this.dialogVisible = false;
+      this.baseForm = {
+        trxrcdSellerid: '',
+        trxrcdBuyerid: '',
+        trxrcdPrice: 0,
+        trxrcdNum: 0
+      }
+       this.$refs.baseForm.resetFields();
     },
     handleClose() {
       this.$emit('update:visible', false);

src/views/waterSubsidy/components/newPolicy.vue

@@ -74,6 +74,7 @@
 <script>
 import { addSubsidyPolicy, editSubsidyPolicy } from '@/api/subsidypolicy/index.js'
 import { getToken } from "@/utils/auth";
+import { checkEmpty } from '@/utils/index';
 import { Message } from 'element-ui'
 import { assign } from 'lodash-es';
 export default {
@@ -127,7 +128,17 @@ export default {
           { required: true, message: '请选择您的图片', trigger: 'change' }
         ],
         subsidypolicyContent: [
-          { required: true, message: '请输入内容', trigger: 'change' }
+          {
+            required: true, validator: (rule, value, callback) => {
+              if (!value) callback(new Error('请输入内容'));
+              const vaild = !checkEmpty(value)
+              if (vaild) {
+                callback()
+              } else {
+                callback(new Error('请输入内容'));
+              }
+
+            }, trigger: 'blur' }
         ]
       }
     };
@@ -156,9 +167,12 @@ export default {
     baseForm: {
       handler(val) {
         const { src, subsidypolicyContent } = val
-        const uploader = this.$refs.uploader
-        const errorUploadText = uploader 
-        console.log(errorUploadText,'uploaderuploaderuploader')
+        if (src) this.$refs['baseForm'].clearValidate(['src'])
+        if (!checkEmpty(subsidypolicyContent)) {
+          this.$refs['baseForm'].clearValidate(['subsidypolicyContent'])
+        } else { 
+          this.$refs['baseForm'].validateField('subsidypolicyContent')
+        }
       },
       deep: true
     }