Skip to content

D
dd_zhxy
Commit 5150afd0 by zhaopanyu
Options

zpy 修改资产管理

parent 9bb8279a
Showing with 80 additions and 49 deletions
src/router/index.js
...@@ -31,7 +31,7 @@ const routes = [ ...@@ -31,7 +31,7 @@ const routes = [
children: [ children: [
{ {
path: "dd", path: "dd",
name: "dd", name: "dl",
component: () => import("../views/dd.vue"), component: () => import("../views/dd.vue"),
meta: { meta: {
requireAuth: true, requireAuth: true,
......
src/views/teacher/schoolProperty/deviceList.vue
<template> <template>
<van-nav-bar title="设备报修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar> <div class="flexBLock searchBlock"> <van-nav-bar title="设备报修" left-text="返回" left-arrow @click-left="goback"></van-nav-bar>
<van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" /> <div class="flexBLock searchBlock">
<van-icon name="scan" @click="getCode"/> <van-search class="searchInput" @search="onSearch" v-model="searchKey" placeholder="请输入设备名称" />
</div> <van-icon name="scan" @click="getCode" />
</div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList"> <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList">
<div style="position:relative;" v-for="(item,index) in list" :key="index" class="listBlock"> <div style="position:relative;" v-for="(item, index) in list" :key="index" class="listBlock">
<div>自编码：{{ item.encode }}</div> <div>自编码：{{ item.encode }}</div>
<div>设备名称：{{ item.equipmentName }}</div> <div>设备名称：{{ item.equipmentName }}</div>
<div>型号：{{item.model}}</div> <div>型号：{{ item.model }}</div>
<div>安装时间：{{ item.dateOfProduction }}</div> <div>安装时间：{{ item.dateOfProduction }}</div>
<div>地点：{{ item.place }}</div> <div>地点：{{ item.place }}</div>
<div>报修日期：{{ item.reportRepairTime }}</div> <div>报修日期：{{ item.reportRepairTime }}</div>
<div>报修人：{{ item.reportRepair }}</div> <div>报修人：{{ item.reportRepair }}</div>
<div>问题：{{ item.problem }}</div> <div>问题：{{ item.problem }}</div>
<div v-if="item.disposeState == 0" class="flexBLock btnBlock"> <div v-if="item.disposeState == 0" class="flexBLock btnBlock">
<van-button size="small" round type="primary" class="btn" @click="toDetail('修改',item.id)">修 改</van-button> <van-button size="small" round type="primary" class="btn" @click="toDetail('修改', item.id)">修 改</van-button>
<van-button size="small" round type="success" class="btn" @click="toDetail('反馈',item.id)">反 馈</van-button> <!-- <van-button size="small" round type="success" class="btn" @click="toDetail('反馈', item.id)">反 馈</van-button> -->
<van-button size="small" round type="default" class="btn" @click="toDetail('查看',item.id)">查 看</van-button> <van-button size="small" round type="default" class="btn" @click="toDetail('查看', item.id)">查 看</van-button>
<van-button size="small" round type="danger" class="btn" @click="deleteDevice(item.id)">删 除</van-button> <van-button size="small" round type="danger" class="btn" @click="deleteDevice(item.id)">删 除</van-button>
</div> </div>
<div v-if="item.disposeState == 1" > <div v-if="item.disposeState == 1">
<!-- <van-button style="margin-right: 10px" size="small" round type="success" class="btn" @click="toDetail('反馈',item.id)">反 馈</van-button>--> <!-- <van-button style="margin-right: 10px" size="small" round type="success" class="btn" @click="toDetail('反馈',item.id)">反 馈</van-button>-->
<van-button size="small" round type="default" class="btn" @click="toDetail('查看',item.id)">查 看</van-button> <van-button size="small" round type="default" class="btn" @click="toDetail('查看', item.id)">查 看</van-button>
</div> </div>
<div class="state"> <div class="state">
<div v-if="item.repairState == 0 && item.disposeState == 1" class="fixed">已处理-已维修</div> <div v-if="item.repairState == 0 && item.disposeState == 1" class="fixed">已处理-已维修</div>
<div v-if="item.repairState == 1 && item.disposeState == 1" class="unable">已处理-已维修</div> <div v-if="item.repairState == 1 && item.disposeState == 1" class="unable">已处理-已维修</div>
</div> </div>
</div> </div>
</van-list> </van-list>
...@@ -34,17 +35,17 @@ ...@@ -34,17 +35,17 @@
</template> </template>
<script setup> <script setup>
import { getDeviceList,deletEuipemnt } from "@/service/schoolProperty" import { getDeviceList, deletEuipemnt } from "@/service/schoolProperty"
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import {onMounted, ref} from "vue"; import { onMounted, ref } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
import {Toast} from "vant"; import { Toast } from "vant";
import {scanCodeFun} from "../../../utils/scanCode"; import { scanCodeFun } from "../../../utils/scanCode";
const router = useRouter(); const router = useRouter();
const store = useStore(); const store = useStore();
const id = store.state.userInfo.userId; const id = store.state.userInfo.userId;
console.log('id',id) console.log('id', id)
const rolesArr = store.state.userInfo.roles; const rolesArr = store.state.userInfo.roles;
let searchKey = ref('') let searchKey = ref('')
const loading = ref(false) const loading = ref(false)
...@@ -53,7 +54,7 @@ const pullLoading = ref(false); ...@@ -53,7 +54,7 @@ const pullLoading = ref(false);
const finished = ref(false); const finished = ref(false);
const equipmentName = ref('') const equipmentName = ref('')
onMounted( () => { onMounted(() => {
}); });
//获取列表数据 //获取列表数据
...@@ -63,13 +64,13 @@ const getList = async () => { ...@@ -63,13 +64,13 @@ const getList = async () => {
// pageNum.value = 0; // pageNum.value = 0;
pullLoading.value = false; pullLoading.value = false;
} }
let result = await getDeviceList(id,equipmentName.value) let result = await getDeviceList(id, equipmentName.value)
console.log('result',result) console.log('result', result)
if(result.code == 200){ if (result.code == 200) {
loading.value = false; loading.value = false;
list.value = result.data list.value = result.data
finished.value = true finished.value = true
}else{ } else {
Toast("获取信息失败!"); Toast("获取信息失败!");
finished.value = true; finished.value = true;
loading.value = false; loading.value = false;
...@@ -77,14 +78,14 @@ const getList = async () => { ...@@ -77,14 +78,14 @@ const getList = async () => {
} }
} }
//搜索 //搜索
const onSearch = async (val) =>{ const onSearch = async (val) => {
list.value = []; list.value = [];
loading.value = true; loading.value = true;
finished.value = false; finished.value = false;
equipmentName.value = val equipmentName.value = val
let searchResult = await getDeviceList(id,equipmentName.value); let searchResult = await getDeviceList(id, equipmentName.value);
console.log('searchResult',searchResult) console.log('searchResult', searchResult)
if(searchResult.code == 200){ if (searchResult.code == 200) {
loading.value = false; loading.value = false;
list.value = searchResult.data list.value = searchResult.data
finished.value = true finished.value = true
...@@ -106,25 +107,25 @@ const getCode = () => { ...@@ -106,25 +107,25 @@ const getCode = () => {
// }) // })
} }
//详情按钮 //详情按钮
const toDetail = (name,id) => { const toDetail = (name, id) => {
console.log('id',id) console.log('id', id)
router.push({ router.push({
path:"/schoolProperty/device/info", path: "/schoolProperty/device/info",
query:{ query: {
name:name, name: name,
id:id id: id
} }
}) })
} }
//删除按钮 //删除按钮
const deleteDevice = async (id) => { const deleteDevice = async (id) => {
console.log('id',id) console.log('id', id)
let result = await deletEuipemnt(id) let result = await deletEuipemnt(id)
if(result.code == 200){ if (result.code == 200) {
Toast.success("删除成功"); Toast.success("删除成功");
getList() getList()
} }
console.log('result',result) console.log('result', result)
} }
//返回上一页 //返回上一页
const goback = () => { const goback = () => {
...@@ -141,26 +142,42 @@ const onRefresh = () => { ...@@ -141,26 +142,42 @@ const onRefresh = () => {
</script> </script>
<style scoped> <style scoped>
.listBlock .flexBLock {
justify-content: start;
display: flex;
gap: 10px;
}
.btnBlock { .btnBlock {
flex-wrap: wrap; flex-wrap: wrap;
} }
.btn { .btn {
width: 75px; width: 75px;
margin-top: 10px; margin-top: 10px;
} }
.state{
position:absolute; /* 自定义 van-button 的样式，减小内边距 */
.van-button {
padding: 4px 8px;
/* 根据实际情况调整内边距 */
}
.state {
position: absolute;
top: 0; top: 0;
right: 0; right: 0;
} }
.fixed{
.fixed {
background: #07c160; background: #07c160;
color: #FFFFFF; color: #FFFFFF;
border-radius: 5px 10px; border-radius: 5px 10px;
width: 100px; width: 100px;
text-align: center; text-align: center;
} }
.unable{
.unable {
background: #1989fa; background: #1989fa;
color: #FFFFFF; color: #FFFFFF;
border-radius: 5px 10px; border-radius: 5px 10px;
......
src/views/teacher/schoolProperty/equipmentFix.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
<van-pull-refresh v-model="pullLoading" @refresh="onRefresh"> <van-pull-refresh v-model="pullLoading" @refresh="onRefresh">
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList"> <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList">
<div style="position:relative;" v-for="(item,index) in list" :key="index" class="listBlock" @click="toDetail(item)"> <div style="position:relative;" v-for="(item,index) in list" :key="index" class="listBlock" >
<div>自编码：{{ item.encode }}</div> <div>自编码：{{ item.encode }}</div>
<div>设备名称：{{ item.equipmentName }}</div> <div>设备名称：{{ item.equipmentName }}</div>
<div>修理人：{{ item.repairName }}</div> <div>修理人：{{ item.repairName }}</div>
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
<div v-if="item.disposeState == '1'" class="fixed">已完成</div> <div v-if="item.disposeState == '1'" class="fixed">已完成</div>
<div v-if="item.disposeState == '0'" class="unable">待维修</div> <div v-if="item.disposeState == '0'" class="unable">待维修</div>
</div> </div>
<div class="flexBLock btnBlock">
<van-button size="small" round type="success" class="btn" @click="toDetails('反馈', item.id)">反 馈</van-button>
</div>
</div> </div>
</van-list> </van-list>
</van-pull-refresh> </van-pull-refresh>
...@@ -129,16 +132,27 @@ const getList = async () => { ...@@ -129,16 +132,27 @@ const getList = async () => {
// }) // })
// } // }
//详情按钮 //详情按钮
const toDetail = (item) => { // const toDetail = (item) => {
console.log('item',item) // console.log('item',item)
// router.push({
// path:"/schoolProperty/equipmentFix/equipmentFixDetail",
// query:{
// id:item.id
// }
// })
// }
//反馈按钮
const toDetails = (name, id) => {
console.log('id', id,name)
router.push({ router.push({
path:"/schoolProperty/equipmentFix/equipmentFixDetail", path: "/schoolProperty/device/info",
query:{ query: {
id:item.id name: name,
id: id
} }
}) })
} }
//返回上一页 //返回上一页
const goback = () => { const goback = () => {
router.back(); router.back();
......
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