Skip to content

P
patzn-cloud-web-h5app-drs
Commit 82602cd7 by zhuxiaomei
Options

消息 生成的按钮

parent 9154d9bd
Showing with 163 additions and 63 deletions
src/api/drs/sampling-place.js
......@@ -8,6 +8,7 @@ export default {
page: data => http.post('/drs/v1/sampling_place/page', data).then(res => res),
pageApp: data => http.post('/drs/v1/sampling_place/page_app', data).then(res => res),
edit: data => http.put('/drs/v1/sampling_place/' + data.id, data.obj).then(res => res),
deleteByIds:ids=>http.delete('/drs/v1/sampling_place/?ids=' + ids).then(res=>res),
listPlaces: data => http.post('/drs/v1/sampling_place/list_places', data).then(res => res),
addMulti: data => http.put('/drs/v1/sampling_place/update_multi_selected', data).then(res => res),
savePlaces:data=>httpJson.post('/drs/v1/sampling_place/savePlaces',JSON.stringify(data)).then(res=>res),
......
src/page/Home.vue
......@@ -19,7 +19,7 @@
</div>
</div>
<div style="display: flex" class="box-c">
<div style="width:50%;background: brown">
<div style="width:50%;background: brown" @click="_goto('/message')">
<!--todo 消息-->
<div>消息</div>
<div>4</div>
......
src/page/Message.vue 0 → 100644
<template>
<div>
<div class="layout-cont">
<!--下拉刷新 https://vant-contrib.gitee.io/vant/#/zh-CN/pull-refresh-->
<van-pull-refresh v-model="refreshing" @refresh="_refresh">
<!--上拉加载 https://vant-contrib.gitee.io/vant/#/zh-CN/list-->
<van-list
v-model="loading"
:finished="finished"
finished-text="没有更多了"
@load="_load">
<van-swipe-cell v-for="item in resultList" :key="item.name">
<div class="result-item">
<div>标题：{{item.title}}</div>
<div>内容：{{item.content}}</div>
<div>发送人：{{item.sender}}</div>
<div>创建时间：{{$dateformat(item.ctime,'yyyy-mm-dd HH:MM')}}</div>
</div>
</van-swipe-cell>
</van-list>
</van-pull-refresh>
</div>
</div>
</template>
<script>
import {message} from '../api'
export default {
data() {
return {
resultList: [],
page: 1,
rows: 10,
refreshing: false,//刷新中...
loading: false,//加载中...
finished: false,//没有更多数据
}
},
mounted() {
this._getData()
},
methods: {
_searchParams() {
let data = {
page: this.page,
rows: this.rows,
service: 'drs',
read: 0
};
return this.$serializeForm(data)
},
_getData: async function () {
let result = await message.myPage(this._searchParams())
this.resultList = [...(this.page === 1 ? [] : this.resultList), ...result.records]
this.refreshing = false
this.loading = false
if (this.resultList.length === result.total) {
this.finished = true
}
},
_refresh() {
this.page = 1;
this._getData()
},
_load() {
this.page = this.page + 1;
this._getData()
},
}
}
</script>
<style scoped>
</style>
src/page/mine/Mine.vue
<template>
<div class="personal-cont">
<div class="layout-cont">
<div class="layout-cont-tab">
<div class="personal-top-img">
<img src="@/assets/touxiang2.png" @click="_goto">
</div>
......
src/page/sampling-list/SamplingList.vue
......@@ -70,9 +70,9 @@
</van-list>
</van-pull-refresh>
</div>
<div class="bottom-btn bottom-btn-two" v-if="showCheck">
<van-button square @click="_checkAll">{{checkAll?'取消全选':'全选'}}</van-button>
<van-button square type="danger" @click="_del(checkListValue)">删除</van-button>
<div class="bottom-btn" v-if="showCheck">
<van-button square block @click="_checkAll">{{checkAll?'取消全选':'全选'}}</van-button>
<van-button square block type="danger" @click="_del(checkListValue)">删除</van-button>
</div>
</template>
<SelectShelves ref="shelvesSelect" @on-select="_shelvesResult"></SelectShelves>
......
src/page/sampling-list/components/SelectShelves.vue
......@@ -28,9 +28,9 @@
></van-tree-select>
</div>
</div>
<div class="bottom-btn bottom-btn-two">
<van-button square type="default" @click="_cancel">取消</van-button>
<van-button square type="info" @click="_ok">确定</van-button>
<div class="bottom-btn">
<van-button square block type="default" @click="_cancel">取消</van-button>
<van-button square block type="info" @click="_ok">确定</van-button>
</div>
</van-popup>
</div>
......
src/page/sampling-list/file/File.vue
......@@ -19,10 +19,10 @@
</van-list>
</van-pull-refresh>
</div>
<div class="bottom-btn bottom-btn-two" >
<div class="bottom-btn" >
<!--<van-button type="info" block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>-->
<van-button type="info" square @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
<van-button type="primary" square @click="_uploadImg">添加图片</van-button>
<van-button type="info" square block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
<van-button type="primary" square block @click="_uploadImg">添加图片</van-button>
</div>
<van-image-preview v-model="showImg" :images="imgList">
<!--<template #:index>第{{ index }}页</template>-->
......
src/page/sampling-plan/SamplingPlan.vue
......@@ -80,14 +80,10 @@
</van-list>
</van-pull-refresh>
</div>
<div class="bottom-btn bottom-btn-five" v-if="showCheck">
<van-button square @click="_checkAll">{{checkAll?'取消全选':'全选'}}</van-button>
<van-button square type="danger" @click="_del(checkListValue)">删除</van-button>
<van-button square type="info" @click="_submit(checkListValue)">提交</van-button>
<!--生成人-->
<van-button square type="primary" @click="_createSampler(checkListValue)">生成抽样人员</van-button>
<!--生成地点-->
<van-button square type="warning" @click="_createLoc(checkListValue)">生成抽样地点</van-button>
<div class="bottom-btn" v-if="showCheck">
<van-button square block @click="_checkAll">{{checkAll?'取消全选':'全选'}}</van-button>
<van-button square block type="danger" @click="_del(checkListValue)">删除</van-button>
<van-button square block type="info" @click="_submit(checkListValue)">提交</van-button>
</div>
</template>
</customer-navBar-layout>
......@@ -284,20 +280,6 @@
// todo 提交
}
},
_createSampler() {
if (this.checkListValue.length === 0) {
this.$toast('请至少选择一条数据！')
} else {
this.$router.push({path: '/sampling_plan/create_sampler', query: {ids: this.checkListValue}})
}
},
_createLoc() {
if (this.checkListValue.length === 0) {
this.$toast('请至少选择一条数据！')
} else {
this.$router.push({path: '/sampling_plan/create_loc', query: {ids: this.checkListValue}})
}
},
_goFile(id) {
this.$router.push({path: '/sampling_plan/file', query: {planId: id}})
}
......
src/page/sampling-plan/SamplingPlanAdd.vue
......@@ -156,13 +156,12 @@
},
onSubmit(res) {
if (this.id) {
this._editSave(res)
this._editSave(this.$serializeForm(res))
} else {
this._addSave(res)
this._addSave(this.$serializeForm(res))
}
},
_editSave: async function (res) {
res.type = 0
let result = await samplingPlan.edit({id: this.id, obj: res})
if (result) {
this.$toast('编辑成功！')
......@@ -170,7 +169,6 @@
}
},
_addSave: async function (res) {
res.type = 0
let result = await samplingPlan.add(res)
if (result) {
this.$toast('添加成功！')
......
src/page/sampling-plan/file/File.vue
......@@ -19,10 +19,10 @@
</van-list>
</van-pull-refresh>
</div>
<div class="bottom-btn bottom-btn-two" >
<div class="bottom-btn" >
<!--<van-button type="info" block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>-->
<van-button type="info" square @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
<van-button type="primary" square @click="_uploadImg">添加图片</van-button>
<van-button type="info" square block @click="_goto('/sampling_list/file_upload')">添加附件</van-button>
<van-button type="primary" square block @click="_uploadImg">添加图片</van-button>
</div>
<van-image-preview v-model="showImg" :images="imgList">
<!--<template #:index>第{{ index }}页</template>-->
......
src/page/sampling-plan/loc/CreateLoc.vue
<template>
<div></div>
<div>
</div>
</template>
<script>
export default {
name: "CreateLoc"
name: "CreateLoc",
data(){
return{
planId:''
}
},
mounted() {
this.planId = this.$route.query.planId
},
methods:{}
}
</script>
......
src/page/sampling-plan/loc/LocChecked.vue
<template>
<div>
<search-bar label="地点名称" @search="_search"></search-bar>
<div class="layout-cont-s layout-cont-s-btn" >
<div class="layout-cont-s layout-cont-s-btn">
<van-pull-refresh v-model="refreshing" @refresh="_refresh">
<van-list
v-model="loading"
......@@ -24,7 +24,8 @@
</van-pull-refresh>
</div>
<div class="bottom-btn">
<van-button type="info" block @click="_add">添加</van-button>
<van-button type="info" square block @click="_add">添加</van-button>
<van-button type="default" square block @click="_create">生成抽样地点</van-button>
</div>
</div>
</template>
......@@ -83,12 +84,19 @@
this.$router.push({path: '/sampling_plan/select_loc', query: {planId: this.planId}})
},
_del: async function (id) {
let result = await samplingPlace.deleteByIds({ids: [id]})
let result = await samplingPlace.deleteByIds([id])
if (result) {
this.$toast('操作成功！')
this._refresh()
}
},
_create() {
if (this.resultList.length === 0) {
this.$toast('请先维护抽样地点！')
} else {
this.$router.push({path: '/sampling_plan/create_loc', query: {planId: this.planId}})
}
}
}
}
</script>
......
src/page/sampling-plan/sampler/CreateSampler.vue
<template>
<div></div>
<div>
</div>
</template>
<script>
export default {
name: "CreateSampler"
name: "CreateSampler",
data() {
return {
planId: ''
}
},
mounted() {
this.planId = this.$route.query.planId
},
methods: {}
}
</script>
......
src/page/sampling-plan/sampler/SamplerChecked.vue
<template>
<div>
<search-bar label="姓名" @search="_search"></search-bar>
<div class="layout-cont-s layout-cont-s-btn" >
<div class="layout-cont-s layout-cont-s-btn">
<van-pull-refresh v-model="refreshing" @refresh="_refresh">
<van-list
v-model="loading"
......@@ -23,7 +23,8 @@
</van-pull-refresh>
</div>
<div class="bottom-btn">
<van-button type="info" block @click="_add">添加</van-button>
<van-button type="info" square block @click="_add">添加</van-button>
<van-button type="default" square block @click="_create">生成抽样人员</van-button>
</div>
</div>
</template>
......@@ -79,7 +80,7 @@
this._getData()
},
_add() {
this.$router.push({path: '/sampling_plan/select_sampler',query:{planId:this.planId}})
this.$router.push({path: '/sampling_plan/select_sampler', query: {planId: this.planId}})
},
_del: async function (id) {
let result = await samplingPlan.deletePlanSampler({samplerId: id, planId: this.planId})
......@@ -88,6 +89,13 @@
this._refresh()
}
},
_create() {
if (this.resultList.length === 0) {
this.$toast('请先维护抽样人员！')
} else {
this.$router.push({path: '/sampling_plan/create_sampler', query: {planId: this.planId}})
}
}
}
}
</script>
......
src/router/routes.js
......@@ -2,6 +2,7 @@ import Index from '@/page/Index'
import Home from '@/page/Home'
import Login from '@/page/Login'
import ForgetPwd from '@/page/ForgetPwd'
import Message from '@/page/Message'
import SamplingPlanRoutes from './sampling-plan-routes'
import SamplingTaskRoutes from './sampling-task-routes'
import SamplingListRoutes from './sampling-list-routes'
......@@ -30,12 +31,17 @@ export default [
name: "forgetPwd",
component: ForgetPwd,
meta: {title: "找回密码", hideNavBar: true},
},{
}, {
path: "/debug",
name: "debug",
component: DebugComponent,
meta: {title: "调试组件页面", hideNavBar: true},
},
}, {
path: "/message",
name: 'message',
component: Message,
meta: {title: '我的消息'}
}
],
}, {
......
src/styles/main.less
......@@ -44,15 +44,23 @@ html, body, #app, .main-content-con {
}
//主要内容 不包括navbar searchbar
.layout-cont {
.layout-cont{
width: 100%;
height: 100%;
overflow: auto;
}
//底部导航
.layout-cont-tab {
width: 100%;
height: calc(100% - 50px);
overflow: auto;
}
//有底部按钮
.layout-cont-btn {
width: 100%;
height: calc(100% - 44px);
overflow: auto;
}
//有search 54
......@@ -90,18 +98,10 @@ html, body, #app, .main-content-con {
.bottom-btn {
width: 100%;
height: 44px;
display: flex;
flex: 1;
}
.bottom-btn-two {
> button {
width: 50%
}
}
.bottom-btn-five {
> button {
width: 20%
}
}
.personal-cont {
.personal-top-img {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment