chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/v2' into v2

v2
chenrui 2 years ago
parent
9ba0840f9c ccf64d8302
commit
9438d5a384
3 changed files with 111 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/administrative.js
  2. 109
      src/views/administrative/appointmentList.vue
  3. 2
      src/views/enterprise/registrationList.vue

1
src/api/administrative.js
View File

@ -13,6 +13,7 @@ export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/enfor
export const cancelEnterpriseLawEnforcement = (id, success, error) => _get("/app/code/enforcement/cancel/" + id,null,success,error)
//查询历史检查信息
export const queryEnterpriseLawEnforcementList = (params, success, error) => _get("/app/code/enforcement/queryList",params,success,error)
export const queryTotal = (params, success, error) => _get("/app/code/enforcement/queryTotal",params,success,error)

109
src/views/administrative/appointmentList.vue
View File

@ -44,18 +44,16 @@
<!-- 中间 -->
<div class="shop-center">
<lodding-card :isLodding="isLodding">
<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
:resetScroll="resetScroll" class="refresh_box">
<div class="refresh_content" v-if="data?.dataList.length">
<van-pull-refresh v-model="data.refreshing" @refresh="onRefresh">
<van-list v-model:loading="data.loading" :finished="data.finished" finished-text="没有更多了" @load="onLoad">
<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
<van-swipe-cell class="swipe_cell">
<!-- <div class="card_box" @click="toDetailView(item.id)">-->
<div class="card_box">
<div class="card_box_span">
<p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
<!-- <span class="card_box_action" v-if="item.isSubmit == 0">-->
<!-- <span class="card_box_action" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
<!-- <span class="card_box_action" v-if="item.isSubmit == 0">-->
<!-- <span class="card_box_action" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
<van-button @click="toEditView(item.id)" type="primary"
size="mini">编辑</van-button>
</span>-->
@ -87,10 +85,8 @@
</div>
</van-swipe-cell>
</div>
</div>
<van-empty v-else class="no_data" description="暂无数据"/>
</refresh-list>
</lodding-card>
</van-list>
</van-pull-refresh>
</div>
<!-- 底部 -->
@ -102,7 +98,7 @@
<script setup name="registrationList">
import {showToast} from "vant";
import {queryEnterpriseLawEnforcementList} from '../../api/administrative';
import {queryEnterpriseLawEnforcementList, queryTotal} from '../../api/administrative';
import {setGoodsNum} from "@/util/util";
import {getDict} from "../../api/Home";
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
@ -117,6 +113,9 @@
let totalPrice = ref(0); // 总钱数
let searchParam = reactive({
// 分页
pageNum: 1,
pageSize: 6,
//执法事件
// lawEnforcementIncident:"",
//执法部门
@ -145,7 +144,12 @@
columnsType: ['year', 'month'],
ga_columns: [],
dateShow: false,
checkNum: null
checkNum: null,
loading: false,
finished: false,
refreshing: false,
curPage: 1,
total: 0,
});
// 设置初始值为当前时间
@ -155,7 +159,8 @@
// }, error => {
// });
queryList();
getTotal();
data.curPage = 1;
data.dateSearch = nowDate(new Date());
isLodding.value = false;
});
@ -173,23 +178,43 @@
}
const queryList = () => {
data.finished = false;
searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
queryEnterpriseLawEnforcementList(searchParam, success => {
for (var i = 0; i < success.data.length; i++) {
var itemTxt = success.data[i].checkItem;
for (var j = 0; j < data.ga_columns.length; j++) {
if (itemTxt == data.ga_columns[j].value) {
success.data[i].checkItem = data.ga_columns[j].text;
break;
}
}
}
data.dataList = success.data;
data.curPage++;
data.loading = false; // 查出结果停止加载
if (data.total <= data.dataList.length) {
// 查到最后没数据
data.finished = true;
return;
}
// for (var i = 0; i < success.data.length; i++) {
// var itemTxt = success.data[i].checkItem;
// for (var j = 0; j < data.ga_columns.length; j++) {
// if (itemTxt == data.ga_columns[j].value) {
// success.data[i].checkItem = data.ga_columns[j].text;
// break;
// }
// }
// }
// data.dataList = success.data;
data.dataList.push(...success.data);
}, error => {
})
}
const getTotal = () => {
queryTotal(searchParam, success => {
data.total = success.data;
}, error => {
});
}
const onSearch = (val) => {
data.curPage = 1;
data.dataList = [];
queryEnterpriseLawEnforcementList(
{
"searchValue": searchParam.searchValue
@ -212,6 +237,9 @@
}
const onClickButton = () => {
getTotal();
data.curPage = 1;
data.dataList = [];
queryList();
}
@ -257,15 +285,25 @@
//下拉刷新
const onRefresh = () => {
freshMap.listFinished = false;
freshMap.listLoading = true;
getGoodslist();
// 清空列表数据
data.dataList = [];
data.finished = false;
// 重新加载数据
// 将 loading 设置为 true，表示处于加载状态
data.loading = true;
onLoad();
};
// 触底加载
const onLoad = () => {
freshMap.listFinished = true;
getGoodslist(true);
console.log("=============><")
setTimeout(() => {
if (data.refreshing) {
data.refreshing = false;
}
queryList();
}, 1000);
};
@ -290,7 +328,6 @@
const selectDate = () => {
data.checkNum = 9;
data.showDatePicker = true;
console.log(data.showDatePicker)
}
const onDateConfirm = (value) => {
@ -300,6 +337,10 @@
searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1]
searchParam.dateType = null;
data.dateShow = true;
getTotal();
data.curPage = 1;
data.dataList = [];
queryList();
}
const nowDate = (time) => {
@ -314,22 +355,28 @@
)
}
const searchDateType = (val) => {
data.checkNum = val;
searchParam.dateType = val;
searchParam.isComplaint = null;
searchParam.searchDate = null;
data.dateShow = false;
getTotal();
data.curPage = 1;
data.dataList = [];
queryList();
}
const searchComplaint = (val) => {
searchParam.isComplaint = val;
searchParam.dateType = null;
getTotal();
data.curPage = 1;
data.dataList = [];
queryList();
}
const toDetailView = (id) => {
console.log(id)
router.push(
{
// path: "/enterprise/enterpriseInspectionDetail",

2
src/views/enterprise/registrationList.vue
View File

@ -107,7 +107,7 @@
</div>
</div>
<div class="btn-list">
<a v-if="item.outTimeDayNum<=4 && isComplaint==0"
<a v-if="item.outTimeDayNum<=4 && item.isComplaint==0"
@click.stop="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText)"><van-icon name="warning-o" />投诉</a>
<a v-if="item.outTimeDayNum<=4 && item.isEvaluate==0"
@click.stop="toEvaluate(item.id,item.lawEnforcementItemText)"><van-icon name="flower-o" />评价</a>

Write Preview
Loading…
Cancel
Save