Compare commits

..

No commits in common. "20b4ca00fb2798b91fa1bf9aaa04dbbf023a71b2" and "66bacc172e62f579f2d518743cc5d8330880560d" have entirely different histories.

9 changed files with 514 additions and 827 deletions

View File

@ -1,9 +1,15 @@
<template> <template>
<u-sticky bgColor="#ffffff"> <u-sticky bgColor="#ffffff">
<view class="card top-flex-box"> <view class="card">
<u--text v-if="isHasFilter" suffixIcon="arrow-down" text="筛选" @click="selfHandleShowPicker" style="flex: 0.2" /> <u-search
<u-search v-model="localInputSearchValue" :showAction="true" actionText="搜索" :animation="false" v-model="localInputSearchValue"
@search="selfHandlerSearch" @custom="selfHandlerSearch" @clear="selfHandlerClear" /> :showAction="true"
actionText="搜索"
:animation="false"
@search="selfHandlerSearch"
@custom="selfHandlerSearch"
@clear="selfHandlerClear"
/>
</view> </view>
<app-line /> <app-line />
</u-sticky> </u-sticky>
@ -16,11 +22,6 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
/** 是否需要启用前置筛选能力 */
isHasFilter: {
type: Boolean,
required: false
}
}, },
data() { data() {
return { return {
@ -28,27 +29,19 @@ export default {
localInputSearchValue: this.inputSearchValue, localInputSearchValue: this.inputSearchValue,
}; };
}, },
watch: { watch: {
// prop // prop
inputSearchValue(newVal) { inputSearchValue(newVal) {
this.localInputSearchValue = newVal; this.localInputSearchValue = newVal;
}, },
}, },
methods: { methods: {
selfHandlerSearch() { selfHandlerSearch() {
this.$emit("search", this.localInputSearchValue); this.$emit("search", this.localInputSearchValue);
}, },
selfHandlerClear() { selfHandlerClear() {
this.localInputSearchValue = ""; this.localInputSearchValue = "";
}, }
/** 组件自身的筛选器处理事件 */
selfHandleShowPicker() {
if (!this.isHasFilter) {
console.log("%c%s", "background: orange; color: black", "请添加 is-has-filter 属性使其生效")
return;
}
this.$emit("showPicker");
}
}, },
}; };
</script> </script>
@ -57,8 +50,4 @@ export default {
.key-word-search-input-box { .key-word-search-input-box {
margin: 20rpx; margin: 20rpx;
} }
.top-flex-box {
display: flex;
}
</style> </style>

View File

@ -1,7 +1,7 @@
<template> <template>
<view v-if="list.length > 0"> <view v-if="list.length > 0">
<view class="list"> <view class="list">
<u-list @scrolltolower="selfScrollToLower" :height="height" style="box-sizing: border-box;"> <u-list @scrolltolower="selfScrollToLower">
<u-list-item v-for="(item, index) in list" :key="index" style="border-bottom: none; padding: 0rpx;"> <u-list-item v-for="(item, index) in list" :key="index" style="border-bottom: none; padding: 0rpx;">
<view class="item"> <view class="item">
<slot :item="item" :index="index" /> <slot :item="item" :index="index" />
@ -20,11 +20,6 @@ export default {
type: Array, type: Array,
required: true, required: true,
}, },
height: {
type: String,
requierd: false,
default: '100%'
}
}, },
data() { data() {

View File

@ -48,18 +48,20 @@
type="primary" type="primary"
size="mini" size="mini"
shape="circle" shape="circle"
text="确认"
@click="handleClickConfirm(item)" @click="handleClickConfirm(item)"
/> >
确认
</u-button>
</view> </view>
<view class="ml-10"> <view class="ml-10">
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
shape="circle" shape="circle"
text="查看"
@click="handleClickView(item)" @click="handleClickView(item)"
/> >
查看
</u-button>
</view> </view>
</view> </view>
</view> </view>
@ -82,25 +84,17 @@ export default {
data() { data() {
return { return {
/** 全局store */ store: this.$store, // store
store: this.$store,
searchForm: { searchForm: {
HIDDENDESCR: "", HIDDENDESCR: "",
}, },
/** 请求是否已结束 */ isRequestEnd: false, //
isRequestEnd: false,
/** 分页配置 */
pagination: { pagination: {
/** 展示总数 */
showCount: 10, showCount: 10,
/** 当前页 */
currentPage: 1, currentPage: 1,
/** 状态确认 */
stateConfirm: "0", stateConfirm: "0",
/** 总页数 */
total: 0, total: 0,
}, },
/** 列表数据存储 */
list: [], list: [],
}; };
}, },
@ -124,10 +118,6 @@ export default {
userInfo() { userInfo() {
return this.$store.getters.getUserInfo; return this.$store.getters.getUserInfo;
}, },
/** 动态计算 list 列表的高度 */
calcListHeight() {
return this.totalHeight;
},
}, },
methods: { methods: {
@ -179,16 +169,22 @@ export default {
}, },
/** 处理点击确认按钮事件 */ /** 处理点击确认按钮事件 */
handleClickConfirm(ext) { handleClickConfirm(ext) {
uni.$u.route("/hiddenManageSubPackages/pages/hidden_confirm/confirm", { uni.$u.route(
HIDDEN_ID: ext.HIDDEN_ID, "/hiddenManageSubPackages/pages/hidden_confirm/confirm",
}); {
HIDDEN_ID: ext.HIDDEN_ID,
}
);
}, },
/** 处理点击查看按钮事件 */ /** 处理点击查看按钮事件 */
handleClickView(ext) { handleClickView(ext) {
uni.$u.route("/hiddenManageSubPackages/pages/hidden_confirm/view", { uni.$u.route(
HIDDEN_ID: ext.HIDDEN_ID, "/hiddenManageSubPackages/pages/hidden_confirm/view",
}); {
}, HIDDEN_ID: ext.HIDDEN_ID,
}
)
}
}, },
}; };
</script> </script>

View File

@ -78,6 +78,7 @@ export default {
this.baseList[baseListKey].NUM = resData.repulseAndCheckCount.repulseAndCheckCount ? resData.repulseAndCheckCount.repulseAndCheckCount : 0 this.baseList[baseListKey].NUM = resData.repulseAndCheckCount.repulseAndCheckCount ? resData.repulseAndCheckCount.repulseAndCheckCount : 0
} }
} }
}, },
}, },
} }

View File

@ -1,156 +1,108 @@
<template> <template>
<view> <view class="content">
<!-- 吸顶搜索框 start --> <view class="search card">
<key-word-search-input <u--input class="ml-10" prefixIcon="search" placeholder="请输入关键字" border="surround" v-model="keyword" clearable
:inputSearchValue="searchForm.HIDDENDESCR" shape="circle"></u--input>
@search="resetList" <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
@showPicker="showPicker" </view>
/> <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<!-- 吸顶搜索框 end --> <u-list-item v-for="(item, index) in list" :key="index">
<view>
<!-- 列表渲染 start --> <view class="flex-between main-title">
<list :list="list" @scroll-to-lower="scrollToLower"> <text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>
<template #default="{ item }"> </view>
<view class="flex-between main-title"> <view class="flex-between mt-10 subtitle">
<text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text> <text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text>
</view> <text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text>
<view class="flex-between mt-10 subtitle"> </view>
<text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text> <view class="flex-between mt-10 subtitle">
<text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text> <text>检查时间 {{ item.INSPECTION_TIME_START }} {{ item.INSPECTION_TIME_END }} </text>
</view> </view>
<view class="flex-between mt-10 subtitle"> <view class="flex-between mt-10 subtitle">
<text <text>
>检查时间 {{ item.INSPECTION_TIME_START }} 状态
{{ item.INSPECTION_TIME_END }} </text <template v-if="item.INSPECTION_STATUS == '0'"></template>
> <template v-else-if="item.INSPECTION_STATUS == '1'">检查人核实中</template>
</view> <template v-else-if="item.INSPECTION_STATUS == '2'">待被检查人确认</template>
<view class="flex-between mt-10 subtitle"> <template v-else-if="item.INSPECTION_STATUS == '3'">待指派</template>
<text> <template v-else-if="item.INSPECTION_STATUS == '4'">指派中</template>
状态 <template v-else-if="item.INSPECTION_STATUS == '5'">指派完成</template>
<template v-if="item.INSPECTION_STATUS == '0'" <template v-else-if="item.INSPECTION_STATUS == '6'">检查待验收</template>
>待检查人核实</template <template v-else-if="item.INSPECTION_STATUS == '7'">检查已验收</template>
> <template v-else-if="item.INSPECTION_STATUS == '8'">已归档</template>
<template v-else-if="item.INSPECTION_STATUS == '1'" <template v-else-if="item.INSPECTION_STATUS == '-1'">检查人核实打回</template>
>检查人核实中</template <template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
> </text>
<template v-else-if="item.INSPECTION_STATUS == '2'" <u-button type="primary" text="申辩记录" size="mini" class="bth-mini ml-10"
>待被检查人确认</template @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button>
> </view>
<template v-else-if="item.INSPECTION_STATUS == '3'" </view>
>待指派</template </u-list-item>
> </u-list>
<template v-else-if="item.INSPECTION_STATUS == '4'" <empty v-else></empty>
>指派中</template </view>
>
<template v-else-if="item.INSPECTION_STATUS == '5'"
>指派完成</template
>
<template v-else-if="item.INSPECTION_STATUS == '6'"
>检查待验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '7'"
>检查已验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '8'"
>已归档</template
>
<template v-else-if="item.INSPECTION_STATUS == '-1'"
>检查人核实打回</template
>
<template v-else-if="item.INSPECTION_STATUS == '-2'"
>被检查人申辩</template
>
</text>
</view>
<view class="flex-end">
<u-button
type="primary"
text="申辩记录"
size="mini"
shape="circle"
@click="fnNavigatorPlead(item.INSPECTION_ID)"
/>
</view>
</template>
</list>
<!-- 列表渲染 end -->
</view>
</template> </template>
<script> <script>
import { getpleadList, getSafetyenvironmentalList } from "../../api"; import { getpleadList, getSafetyenvironmentalList } from "../../api";
import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue"; import { initiateList } from '../../../Mock/safetyEnvirData';
import List from "@/components/list/list.vue";
import { initiateList } from "../../../Mock/safetyEnvirData";
export default { export default {
components: { keyWordSearchInput, List }, data() {
return {
keyword: '',
pageSize: 10,
currentPage: 1,
totalPage: 0,
list: [],
}
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
onShow() {
this.resetList()
},
methods: {
async getData() {
// TODO: ,
// let resData = await getpleadList({
// loginUserId: this.userInfo.USER_ID,
// supDeparIds: this.userInfo.supDeparIds,
// roleLevel: this.userInfo.roleLevel,
// CORPINFO_ID: this.userInfo.CORPINFO_ID,
// KEYWORDS: this.keyword,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
data() { this.list = initiateList;
return { this.totalPage = initiateList.length;
searchForm: { },
HIDDENDESCR: "", resetList() {
}, this.pageSize = 10
pageSize: 10, this.currentPage = 1
currentPage: 1, this.list = []
totalPage: 0, this.getData()
list: [], },
}; fnNavigatorPlead(INSPECTION_ID) {
}, uni.$u.route({
computed: { url: '/safetyEnvirSubPackages/pages/defense-record/plead-list',
userInfo() { params: {
return this.$store.getters.getUserInfo; INSPECTION_ID,
}, }
}, })
onShow() { },
this.resetList(); scrolltolower() {
}, this.currentPage++;
methods: { if (this.totalPage >= this.currentPage) this.getData();
async getData() { },
uni.showLoading({ }
title: "加载中", }
});
// TODO: ,
// let resData = await getpleadList({
// loginUserId: this.userInfo.USER_ID,
// supDeparIds: this.userInfo.supDeparIds,
// roleLevel: this.userInfo.roleLevel,
// CORPINFO_ID: this.userInfo.CORPINFO_ID,
// KEYWORDS: this.keyword,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
// mock
setTimeout(() => {
this.list = initiateList;
this.totalPage = initiateList.length;
uni.hideLoading();
}, 400);
},
resetList() {
this.pageSize = 10;
this.currentPage = 1;
this.list = [];
this.getData();
},
fnNavigatorPlead(INSPECTION_ID) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/defense-record/plead-list",
params: {
INSPECTION_ID,
},
});
},
scrolltolower() {
this.currentPage++;
if (this.totalPage >= this.currentPage) this.getData();
},
},
};
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -1,252 +1,165 @@
<template> <template>
<view> <view class="content">
<!-- 吸顶搜索框 start --> <view class="search card">
<key-word-search-input <u--text suffixIcon="arrow-down" text="筛选" @click="showPicker"></u--text>
:inputSearchValue="searchForm.HIDDENDESCR" <u--input class="ml-10" prefixIcon="search" placeholder="请输入关键字" border="surround" v-model="keyword" clearable
@search="resetList" shape="circle"></u--input>
is-has-filter <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
@showPicker="showPicker" </view>
/> <u-picker :show="show" :columns="columns" keyName="name" @cancel="show = false" @confirm="confirmPicker"></u-picker>
<!-- 吸顶搜索框 end --> <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
<!-- 筛选器 start --> <view>
<u-picker <view class="flex-between main-title">
:show="show" <text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>
:columns="columns" </view>
keyName="name" <view class="flex-between mt-10 subtitle">
@cancel="show = false" <text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text>
@confirm="confirmPicker" <text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text>
/> </view>
<!-- 筛选器 end --> <view class="flex-between mt-10 subtitle">
<text>检查时间 {{ item.INSPECTION_TIME_START }} {{ item.INSPECTION_TIME_END }} </text>
<!-- 列表渲染 start --> </view>
<list :list="list" @scroll-to-lower="scrollToLower"> <view class="flex-between mt-10 subtitle">
<template #default="{ item }"> <text>
<view class="flex-between main-title"> 状态
<text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text> <template v-if="item.INSPECTION_STATUS == '0'"></template>
</view> <template v-else-if="item.INSPECTION_STATUS == '1'">检查人核实中</template>
<view class="flex-between mt-10 subtitle"> <template v-else-if="item.INSPECTION_STATUS == '2'">待被检查人确认</template>
<text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text> <template v-else-if="item.INSPECTION_STATUS == '3'">待指派</template>
<text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text> <template v-else-if="item.INSPECTION_STATUS == '4'">指派中</template>
</view> <template v-else-if="item.INSPECTION_STATUS == '5'">指派完成</template>
<view class="flex-between mt-10 subtitle"> <template v-else-if="item.INSPECTION_STATUS == '6'">检查待验收</template>
<text <template v-else-if="item.INSPECTION_STATUS == '7'">检查已验收</template>
>检查时间 {{ item.INSPECTION_TIME_START }} <template v-else-if="item.INSPECTION_STATUS == '8'">已归档</template>
{{ item.INSPECTION_TIME_END }} </text <template v-else-if="item.INSPECTION_STATUS == '-1'">检查人核实打回</template>
> <template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
</view> </text>
<view class="flex-between mt-10 subtitle"> </view>
<text> <view class="flex-end mt-10">
状态 <u-button type="primary" text="查看" size="mini" class="bth-mini"
<template v-if="item.INSPECTION_STATUS == '0'" @click="fnNavigatorDetail(item.INSPECTION_ID, 'view')"></u-button>
>待检查人核实</template <u-button type="primary" text="流程图" size="mini" class="bth-mini ml-10"
> @click="showFlowChart(item.INSPECTION_ID)"></u-button>
<template v-else-if="item.INSPECTION_STATUS == '1'" <u-button type="primary" text="编辑" size="mini" class="bth-mini ml-10"
>检查人核实中</template v-show="item.INSPECTION_STATUS === '-1'" @click="fnNavigatorDetail(item.INSPECTION_ID, 'edit')"></u-button>
> <u-button type="primary" text="申辩处理" size="mini" class="bth-mini ml-10"
<template v-else-if="item.INSPECTION_STATUS == '2'" v-show="item.INSPECTION_STATUS === '-2'" @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button>
>待被检查人确认</template </view>
> </view>
<template v-else-if="item.INSPECTION_STATUS == '3'" </u-list-item>
>待指派</template </u-list>
> <empty v-else></empty>
<template v-else-if="item.INSPECTION_STATUS == '4'" </view>
>指派中</template
>
<template v-else-if="item.INSPECTION_STATUS == '5'"
>指派完成</template
>
<template v-else-if="item.INSPECTION_STATUS == '6'"
>检查待验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '7'"
>检查已验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '8'"
>已归档</template
>
<template v-else-if="item.INSPECTION_STATUS == '-1'"
>检查人核实打回</template
>
<template v-else-if="item.INSPECTION_STATUS == '-2'"
>被检查人申辩</template
>
</text>
</view>
<view class="flex-end">
<view>
<u-button
type="primary"
text="查看"
size="mini"
shape="circle"
@click="fnNavigatorDetail(item.INSPECTION_ID, 'view')"
/>
</view>
<view class="ml-10">
<u-button
type="primary"
text="流程图"
size="mini"
shape="circle"
@click="showFlowChart(item.INSPECTION_ID)"
/>
</view>
<view class="ml-10" v-if="item.INSPECTION_STATUS === '-1'">
<u-button
type="primary"
text="编辑"
size="mini"
shape="circle"
@click="fnNavigatorDetail(item.INSPECTION_ID, 'edit')"
/>
</view>
<view class="ml-10" v-if="item.INSPECTION_STATUS === '-2'">
<u-button
type="primary"
text="申辩处理"
size="mini"
shape="circle"
@click="fnNavigatorPlead(item.INSPECTION_ID)"
/>
</view>
</view>
</template>
</list>
<!-- 列表渲染 end -->
</view>
</template> </template>
<script> <script>
import { getSafetyenvironmentalList } from "../../api"; import { getSafetyenvironmentalList } from "../../api";
import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue"; import { initiateList } from '../../../Mock/safetyEnvirData';
import List from "@/components/list/list.vue";
import { initiateList } from "../../../Mock/safetyEnvirData";
export default { export default {
components: { keyWordSearchInput, List }, data() {
return {
show: false,
columns: [
[
{ id: '', name: '请选择' },
{ id: '0', name: '待检查人核实' },
{ id: '1', name: '检查人核实中' },
{ id: '2', name: '待被检查人确认' },
{ id: '3', name: '已归档' },
{ id: '4', name: '指派中' },
{ id: '5', name: '指派完成' },
{ id: '6', name: '待验收' },
{ id: '7', name: '已验收' },
{ id: '-1', name: '检查人核实打回' },
{ id: '-2', name: '被检查人申辩' }
]
],
keyword: '',
INSPECTION_STATUS: '',
pageSize: 10,
currentPage: 1,
totalPage: 0,
list: [],
}
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
this.fnNavigatorDetail('', 'add');
}
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
onShow() {
this.resetList()
},
methods: {
async getData() {
// TODO: ,
// let resData = await getSafetyenvironmentalList({
// loginUserId: this.userInfo.USER_ID,
// supDeparIds: this.userInfo.supDeparIds,
// roleLevel: this.userInfo.roleLevel,
// KEYWORDS: this.keyword,
// INSPECTION_STATUS: this.INSPECTION_STATUS,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
data() { this.list = initiateList;
return { this.totalPage = initiateList.length;
show: false, },
columns: [ resetList() {
[ this.pageSize = 10
{ id: "", name: "请选择" }, this.currentPage = 1
{ id: "0", name: "待检查人核实" }, this.list = []
{ id: "1", name: "检查人核实中" }, this.getData()
{ id: "2", name: "待被检查人确认" }, },
{ id: "3", name: "已归档" }, showPicker() {
{ id: "4", name: "指派中" }, this.show = true;
{ id: "5", name: "指派完成" }, },
{ id: "6", name: "待验收" }, confirmPicker(e) {
{ id: "7", name: "已验收" }, this.INSPECTION_STATUS = e.value[0].id
{ id: "-1", name: "检查人核实打回" }, this.show = false;
{ id: "-2", name: "被检查人申辩" }, this.resetList()
], },
], fnNavigatorDetail(INSPECTION_ID, type) {
searchForm: { uni.$u.route({
HIDDENDESCR: "", url: '/safetyEnvirSubPackages/pages/initiate/detail',
}, params: {
INSPECTION_STATUS: "", INSPECTION_ID,
pageSize: 10, type
currentPage: 1, }
totalPage: 0, })
list: [], },
}; //
}, fnNavigatorPlead(INSPECTION_ID) {
onNavigationBarButtonTap(e) { uni.$u.route({
if (e.index === 0) { url: '/safetyEnvirSubPackages/pages/initiate/plead',
this.fnNavigatorDetail("", "add"); params: {
} INSPECTION_ID,
}, }
computed: { })
userInfo() { },
return this.$store.getters.getUserInfo; //
}, scrolltolower() {
}, this.currentPage++;
onShow() { if (this.totalPage >= this.currentPage) this.getData();
this.resetList(); },
}, //
methods: { showFlowChart(id) {
async getData() { uni.navigateTo({
uni.showLoading({ url: '/safetyEnvirSubPackages/pages/initiate/steps?ID=' + id
title: "加载中", });
}); },
// TODO: , }
// let resData = await getSafetyenvironmentalList({ }
// loginUserId: this.userInfo.USER_ID,
// supDeparIds: this.userInfo.supDeparIds,
// roleLevel: this.userInfo.roleLevel,
// KEYWORDS: this.keyword,
// INSPECTION_STATUS: this.INSPECTION_STATUS,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
// mock
setTimeout(() => {
this.list = initiateList;
this.totalPage = initiateList.length;
uni.hideLoading();
}, 400);
},
resetList() {
this.pageSize = 10;
this.currentPage = 1;
this.list = [];
this.getData();
},
showPicker() {
this.show = true;
},
confirmPicker(e) {
this.INSPECTION_STATUS = e.value[0].id;
this.show = false;
this.resetList();
},
fnNavigatorDetail(INSPECTION_ID, type) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/initiate/detail",
params: {
INSPECTION_ID,
type,
},
});
},
/**
* 申辩处理按钮事件
*/
fnNavigatorPlead(INSPECTION_ID) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/initiate/plead",
params: {
INSPECTION_ID,
},
});
},
/**
* 滚动加载数据
*/
scrolltolower() {
this.currentPage++;
if (this.totalPage >= this.currentPage) this.getData();
},
/**
* 查看流程图
*/
showFlowChart(id) {
uni.navigateTo({
url: "/safetyEnvirSubPackages/pages/initiate/steps?ID=" + id,
});
},
},
};
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss"></style>
.self-time {
font-size: 14px;
}
</style>

View File

@ -1,184 +1,121 @@
<template> <template>
<view> <view class="content">
<!-- 吸顶搜索框 start --> <view class="search card">
<key-word-search-input <u--input prefixIcon="search" placeholder="请输入关键字" border="surround" v-model="keyword" clearable
:inputSearchValue="searchForm.HIDDENDESCR" shape="circle"></u--input>
@search="resetList" <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
@showPicker="showPicker" </view>
/> <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<!-- 吸顶搜索框 end --> <u-list-item v-for="(item, index) in list" :key="index">
<view>
<!-- 列表渲染 start --> <view class="flex-between main-title">
<list :list="list" @scroll-to-lower="scrollToLower"> <text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>
<template #default="{ item }"> </view>
<view class="flex-between main-title"> <view class="flex-between mt-10 subtitle">
<text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text> <text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text>
</view> <text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text>
<view class="flex-between mt-10 subtitle"> </view>
<text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text> <view class="flex-between mt-10 subtitle">
<text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text> <text>检查时间 {{ item.INSPECTION_TIME_START }} {{ item.INSPECTION_TIME_END }} </text>
</view> </view>
<view class="flex-between mt-10 subtitle"> <view class="flex-between mt-10 subtitle">
<text <text>
>检查时间 {{ item.INSPECTION_TIME_START }} 状态
{{ item.INSPECTION_TIME_END }} </text <template v-if="item.INSPECTION_STATUS == '0'"></template>
> <template v-else-if="item.INSPECTION_STATUS == '1'">检查人核实中</template>
</view> <template v-else-if="item.INSPECTION_STATUS == '2'">待被检查人确认</template>
<view class="flex-between mt-10 subtitle"> <template v-else-if="item.INSPECTION_STATUS == '3'">待指派</template>
<text> <template v-else-if="item.INSPECTION_STATUS == '4'">指派中</template>
状态 <template v-else-if="item.INSPECTION_STATUS == '5'">指派完成</template>
<template v-if="item.INSPECTION_STATUS == '0'" <template v-else-if="item.INSPECTION_STATUS == '6'">检查待验收</template>
>待检查人核实</template <template v-else-if="item.INSPECTION_STATUS == '7'">检查已验收</template>
> <template v-else-if="item.INSPECTION_STATUS == '8'">已归档</template>
<template v-else-if="item.INSPECTION_STATUS == '1'" <template v-else-if="item.INSPECTION_STATUS == '-1'">检查人核实打回</template>
>检查人核实中</template <template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
> </text>
<template v-else-if="item.INSPECTION_STATUS == '2'" </view>
>待被检查人确认</template <view class="flex-end mt-10">
> <u-button type="primary" text="查看" size="mini" class="bth-mini"
<template v-else-if="item.INSPECTION_STATUS == '3'" @click="fnNavigatorDetail(item.INSPECTION_ID)"></u-button>
>待指派</template <u-button
> v-show="(item.INSPECTION_STATUS === '6' || item.INSPECTION_STATUS === '5' || item.INSPECTION_STATUS === '7') && item.checkout === 1"
<template v-else-if="item.INSPECTION_STATUS == '4'" type="primary" text="验收" size="mini" class="bth-mini ml-10"
>指派中</template @click="fnNavigatorAcceptance(item.INSPECTION_ID)"></u-button>
> </view>
<template v-else-if="item.INSPECTION_STATUS == '5'" </view>
>指派完成</template </u-list-item>
> </u-list>
<template v-else-if="item.INSPECTION_STATUS == '6'" <empty v-else></empty>
>检查待验收</template </view>
>
<template v-else-if="item.INSPECTION_STATUS == '7'"
>检查已验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '8'"
>已归档</template
>
<template v-else-if="item.INSPECTION_STATUS == '-1'"
>检查人核实打回</template
>
<template v-else-if="item.INSPECTION_STATUS == '-2'"
>被检查人申辩</template
>
</text>
</view>
<view class="flex-end">
<view>
<u-button
type="primary"
text="查看"
size="mini"
shape="circle"
@click="fnNavigatorDetail(item.INSPECTION_ID)"
/>
</view>
<view
class="ml-10"
v-if="
(item.INSPECTION_STATUS === '6' ||
item.INSPECTION_STATUS === '5' ||
item.INSPECTION_STATUS === '7') &&
item.checkout === 1
"
>
<u-button
type="primary"
text="验收"
size="mini"
shape="circle"
@click="fnNavigatorAcceptance(item.INSPECTION_ID)"
></u-button>
</view>
</view>
</template>
</list>
</view>
</template> </template>
<script> <script>
import { import { getSafetyenvironmentalCheckList, getSafetyenvironmentalList } from "../../api";
getSafetyenvironmentalCheckList, import { initiateList } from '../../../Mock/safetyEnvirData';
getSafetyenvironmentalList,
} from "../../api";
import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue";
import List from "@/components/list/list.vue";
import { initiateList } from "../../../Mock/safetyEnvirData";
export default { export default {
components: { keyWordSearchInput, List }, data() {
return {
keyword: '',
pageSize: 10,
currentPage: 1,
totalPage: 0,
list: [],
}
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
onShow() {
this.resetList()
},
methods: {
async getData() {
// TODO: ,
// let resData = await getSafetyenvironmentalCheckList({
// INSPECTION_ORIGINATOR_ID: this.userInfo.USER_ID,
// KEYWORDS: this.keyword,
// INSPECTION_STATUS: '3-7',
// showCount: this.pageSize,
// currentPage: this.currentPage,
// ARCHIVE_USER_ID: this.userInfo.USER_ID
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
data() { this.list = initiateList;
return { this.totalPage = initiateList.length;
searchForm: { },
HIDDENDESCR: "", resetList() {
}, this.pageSize = 10
pageSize: 10, this.currentPage = 1
currentPage: 1, this.list = []
totalPage: 0, this.getData()
list: [], },
}; fnNavigatorDetail(INSPECTION_ID) {
}, uni.$u.route({
computed: { url: '/safetyEnvirSubPackages/pages/inspector-archives/detail',
userInfo() { params: {
return this.$store.getters.getUserInfo; INSPECTION_ID,
}, }
}, })
onShow() { },
this.resetList(); fnNavigatorAcceptance(INSPECTION_ID) {
}, uni.$u.route({
methods: { url: '/safetyEnvirSubPackages/pages/inspector-archives/acceptance-list',
async getData() { params: {
uni.showLoading({ INSPECTION_ID,
title: "加载中", }
}); })
// TODO: , },
// let resData = await getSafetyenvironmentalCheckList({ scrolltolower() {
// INSPECTION_ORIGINATOR_ID: this.userInfo.USER_ID, this.currentPage++;
// KEYWORDS: this.keyword, if (this.totalPage >= this.currentPage) this.getData();
// INSPECTION_STATUS: '3-7', },
// showCount: this.pageSize, }
// currentPage: this.currentPage, }
// ARCHIVE_USER_ID: this.userInfo.USER_ID
// });
// this.list = [...this.list, ...resData.varList];
// this.totalPage = resData.page.totalPage;
// mock
setTimeout(() => {
this.list = initiateList;
this.totalPage = initiateList.length;
uni.hideLoading();
}, 400);
},
resetList() {
this.pageSize = 10;
this.currentPage = 1;
this.list = [];
this.getData();
},
fnNavigatorDetail(INSPECTION_ID) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/inspector-archives/detail",
params: {
INSPECTION_ID,
},
});
},
fnNavigatorAcceptance(INSPECTION_ID) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/inspector-archives/acceptance-list",
params: {
INSPECTION_ID,
},
});
},
scrolltolower() {
this.currentPage++;
if (this.totalPage >= this.currentPage) this.getData();
},
},
};
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

View File

@ -1,215 +1,119 @@
<template> <template>
<view> <view class="content">
<!-- 吸顶搜索框 start --> <view class="search card">
<key-word-search-input <u--input prefixIcon="search" placeholder="请输入关键字" border="surround" v-model="keyword" clearable
:inputSearchValue="searchForm.HIDDENDESCR" shape="circle"></u--input>
@search="resetList" <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
@showPicker="showPicker" </view>
/> <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<!-- 吸顶搜索框 end --> <u-list-item v-for="(item, index) in list" :key="index">
<view>
<!-- 列表渲染 start --> <view class="flex-between main-title">
<list :list="list" @scroll-to-lower="scrollToLower"> <text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>
<template #default="{ item }"> </view>
<view class="flex-between main-title"> <view class="flex-between mt-10 subtitle">
<text>被检查单位{{ item.INSPECTED_CORPINFO_ID_NAME }}</text> <text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text>
</view> <text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text>
<view class="flex-between mt-10 subtitle"> </view>
<text>检查发起人{{ item.INSPECTION_ORIGINATOR_NAME }}</text> <view class="flex-between mt-10 subtitle">
<text>检查类型{{ item.INSPECTION_TYPE_NAME }}</text> <text>检查时间 {{ item.INSPECTION_TIME_START }} {{ item.INSPECTION_TIME_END }} </text>
</view> </view>
<view class="flex-between mt-10 subtitle"> <view class="flex-between mt-10 subtitle">
<text <text>
>检查时间 {{ item.INSPECTION_TIME_START }} 状态
{{ item.INSPECTION_TIME_END }} </text <template v-if="item.INSPECTION_STATUS == '0'"></template>
> <template v-else-if="item.INSPECTION_STATUS == '1'">检查人核实中</template>
</view> <template v-else-if="item.INSPECTION_STATUS == '2'">待被检查人确认</template>
<view class="flex-between mt-10 subtitle"> <template v-else-if="item.INSPECTION_STATUS == '3'">待指派</template>
<text> <template v-else-if="item.INSPECTION_STATUS == '4'">指派中</template>
状态 <template v-else-if="item.INSPECTION_STATUS == '5'">指派完成</template>
<template v-if="item.INSPECTION_STATUS == '0'" <template v-else-if="item.INSPECTION_STATUS == '6'">检查待验收</template>
>待检查人核实</template <template v-else-if="item.INSPECTION_STATUS == '7'">检查已验收</template>
> <template v-else-if="item.INSPECTION_STATUS == '8'">已归档</template>
<template v-else-if="item.INSPECTION_STATUS == '1'" <template v-else-if="item.INSPECTION_STATUS == '-1'">检查人核实打回</template>
>检查人核实中</template <template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
> </text>
<template v-else-if="item.INSPECTION_STATUS == '2'" </view>
>待被检查人确认</template <view class="flex-end mt-10">
> <u-button type="primary" text="查看" size="mini" class="bth-mini"
<template v-else-if="item.INSPECTION_STATUS == '3'" @click="fnNavigatorDetail(item.INSPECTION_ID, item.INSPECTION_USER_ID, item.INSPECTION_INSPECTOR_ID, 'view')"></u-button>
>待指派</template <u-button
> v-if="!validStr(item.INSPECTION_USER_SIGN_TIME) && (item.INSPECTION_STATUS == '0' || item.INSPECTION_STATUS == '1')"
<template v-else-if="item.INSPECTION_STATUS == '4'" type="primary" text="核实" size="mini" class="bth-mini ml-10"
>指派中</template @click="fnNavigatorDetail(item.INSPECTION_ID, item.INSPECTION_USER_ID, item.INSPECTION_INSPECTOR_ID, 'verify')"></u-button>
> </view>
<template v-else-if="item.INSPECTION_STATUS == '5'" </view>
>指派完成</template </u-list-item>
> </u-list>
<template v-else-if="item.INSPECTION_STATUS == '6'" <empty v-else></empty>
>检查待验收</template </view>
>
<template v-else-if="item.INSPECTION_STATUS == '7'"
>检查已验收</template
>
<template v-else-if="item.INSPECTION_STATUS == '8'"
>已归档</template
>
<template v-else-if="item.INSPECTION_STATUS == '-1'"
>检查人核实打回</template
>
<template v-else-if="item.INSPECTION_STATUS == '-2'"
>被检查人申辩</template
>
</text>
</view>
<view class="flex-end">
<u-button
type="primary"
text="查看"
size="mini"
shape="circle"
@click="
fnNavigatorDetail(
item.INSPECTION_ID,
item.INSPECTION_USER_ID,
item.INSPECTION_INSPECTOR_ID,
'view'
)
"
/>
<view class="ml-10">
<u-button
type="primary"
text="流程图"
size="mini"
shape="circle"
@click="showFlowChart(item.INSPECTION_ID)"
/>
</view>
<view
class="ml-10"
v-if="
!validStr(item.INSPECTION_USER_SIGN_TIME) &&
(item.INSPECTION_STATUS == '0' || item.INSPECTION_STATUS == '1')
"
>
<u-button
type="primary"
text="核实"
size="mini"
shape="circle"
@click="
fnNavigatorDetail(
item.INSPECTION_ID,
item.INSPECTION_USER_ID,
item.INSPECTION_INSPECTOR_ID,
'verify'
)
"
/>
</view>
</view>
</template>
</list>
</view>
</template> </template>
<script> <script>
import { getSafetyenvironmentalinspectorList } from "../../api"; import { getSafetyenvironmentalinspectorList } from "../../api";
import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue"; import { initiateList } from '../../../Mock/safetyEnvirData';
import List from "@/components/list/list.vue";
import { initiateList } from "../../../Mock/safetyEnvirData";
export default { export default {
components: { keyWordSearchInput, List }, data() {
return {
keyword: '',
INSPECTION_STATUS: '',
pageSize: 10,
currentPage: 1,
totalPage: 0,
list: [],
}
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
onShow() {
this.resetList()
},
methods: {
validStr(str) {
if (str != null && str != '' && typeof (str) != 'undefined' && str != 'undefined' && str != 0 && str != 'null') { return true }
return false
},
async getData() {
// TODO: ,
// let resData = await getSafetyenvironmentalinspectorList({
// INSPECTION_USER_ID: this.userInfo.USER_ID,
// KEYWORDS: this.keyword,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list,...resData.varList];
// this.totalPage = resData.page.totalPage;
data() { this.list = initiateList;
return { this.totalPage = initiateList.length;
searchForm: { },
HIDDENDESCR: "", resetList() {
}, this.pageSize = 10
INSPECTION_STATUS: "", this.currentPage = 1
pageSize: 10, this.list = []
currentPage: 1, this.getData()
totalPage: 0, },
list: [], fnNavigatorDetail(INSPECTION_ID, INSPECTION_USER_ID, INSPECTION_INSPECTOR_ID, type) {
}; uni.$u.route({
}, url: '/safetyEnvirSubPackages/pages/inspector-confirms/detail',
computed: { params: {
userInfo() { INSPECTION_ID,
return this.$store.getters.getUserInfo; INSPECTION_USER_ID,
}, INSPECTION_INSPECTOR_ID,
}, type
onShow() { }
this.resetList(); })
}, },
methods: { scrolltolower() {
validStr(str) { this.currentPage++;
if ( if (this.totalPage >= this.currentPage) this.getData();
str != null && },
str != "" && }
typeof str != "undefined" && }
str != "undefined" &&
str != 0 &&
str != "null"
) {
return true;
}
return false;
},
async getData() {
uni.showLoading({
title: "加载中",
});
// TODO: ,
// let resData = await getSafetyenvironmentalinspectorList({
// INSPECTION_USER_ID: this.userInfo.USER_ID,
// KEYWORDS: this.keyword,
// showCount: this.pageSize,
// currentPage: this.currentPage,
// });
// this.list = [...this.list,...resData.varList];
// this.totalPage = resData.page.totalPage;
// mock
setTimeout(() => {
this.list = initiateList;
this.totalPage = initiateList.length;
uni.hideLoading();
}, 400);
},
resetList() {
this.pageSize = 10;
this.currentPage = 1;
this.list = [];
this.getData();
},
fnNavigatorDetail(
INSPECTION_ID,
INSPECTION_USER_ID,
INSPECTION_INSPECTOR_ID,
type
) {
uni.$u.route({
url: "/safetyEnvirSubPackages/pages/inspector-confirms/detail",
params: {
INSPECTION_ID,
INSPECTION_USER_ID,
INSPECTION_INSPECTOR_ID,
type,
},
});
},
/**
* 滚动加载数据
*/
scrolltolower() {
this.currentPage++;
if (this.totalPage >= this.currentPage) this.getData();
},
},
};
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

View File

@ -1,4 +1,4 @@
let requestPath = "http://192.168.0.112:8088"; let requestPath = "http://192.168.0.115:8088";
// let requestPath = 'http://192.168.0.31:8992/qa-prevention-xgf/'; // 后台请求地址 // let requestPath = 'http://192.168.0.31:8992/qa-prevention-xgf/'; // 后台请求地址
// let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址 // let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址
// let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址 // let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址