merge branch 'develop' of http://code.nyzhwlw.com:3000/com_yunfeiyun_develop/agmp_wpr_vue into develop

src/api/card/index.js

@@ -59,7 +59,11 @@ export const getRechargercdList = (query) => {
   return request({
     url: '/wpr/rechargercd/list',
     method: 'get',
-    params: query
+    params: {
+      ...query,
+      orderByColumn: 'rechargercdRechargetime',
+      isAsc: 'desc'
+    }
   });
 };
 

src/api/record/index.js

@@ -14,6 +14,10 @@ export function fetchRechargeRecordList(query) {
   return request({
     url: '/wpr/rechargercd/list',
     method: 'get',
-    params: query
+    params: {
+      ...query,
+      orderByColumn: 'rechargercdRechargetime',
+      isAsc: 'desc'
+    }
   });
 }

src/components/SelectTree/index.vue

@@ -53,7 +53,7 @@ export default {
       defaultProps: {
         children: 'child',
         label: 'cusareaName',
-        value: 'code'
+        value: 'cusareaId'
       },
       node: {
         cusareaName: this.checkVal

src/views/equipmentList/components/MyCard.vue

@@ -46,9 +46,21 @@
           <el-descriptions-item label="SIM卡">
             {{ ListItem.devTag === '1' ? '高空测报灯' : '普通测报灯' }}
           </el-descriptions-item> -->
-          <el-descriptions-item label="上报日期">{{
-            ListItem.devUpdateddate
-          }}</el-descriptions-item>
+          <el-descriptions-item
+            label="上报日期"
+            v-if="ListItem.devtypePid !== DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.devUpdateddate }}</el-descriptions-item
+          >
+          <el-descriptions-item
+            label="行政区划"
+            v-if="ListItem.devtypePid === DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.extInfo || '' }}</el-descriptions-item
+          >
+          <el-descriptions-item
+            label="添加日期"
+            v-if="ListItem.devtypePid === DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.devCreateddate || '' }}</el-descriptions-item
+          >
         </el-descriptions>
       </div>
       <div>

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -400,17 +400,17 @@ export default {
       return list.find((item) => item.areaId === areaId);
     },
     async handlerClick(item) {
-      const res = await getAreaInfo({
-        waterrightYear: new Date().getFullYear(),
-        areaId: item.areaId
-      });
+      // const res = await getAreaInfo({
+      //   waterrightYear: new Date().getFullYear(),
+      //   areaId: item.areaId
+      // });
       this.currentItem = item;
-      const value = res?.data;
+      // const value = res?.data;
       this.cusareaName = item?.cusareaName;
       const areaId = item?.areaId || '';
       this.baseForm.areaId = areaId;
       this.$set(this.baseForm, 'areaId', areaId);
-      this.setItem(value);
+      // this.setItem(value);
     },
     resetForm() {
       this.dialogVisible = false;

src/views/peasantHouseholdManage/index.vue

@@ -112,7 +112,7 @@
                 @click="showDetails(scope.row)"
                 >详情</el-link
               >
-              <el-link
+              <!-- <el-link
                 slot="reference"
                 size="small"
                 :underline="false"
@@ -121,7 +121,7 @@
                 v-hasPermi="['wpr:farmer:delete']"
                 @click="deleteRow(scope.row)"
                 >删除</el-link
-              >
+              > -->
             </template>
           </b-table>
         </el-col>