linweidong
/
besure_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.生产计划样式调整；

Browse Source 
2.修复小程序中，按钮点击无效bug，请使用u-button,el-button小程序无法使用
main
sunshine 2 years ago
parent 57215aae78
commit ad6ea92473
2 changed files with 239 additions and 130 deletions
Show Stats Download Patch File Download Diff File

347
src/pages/index.vue
Unescape Escape View File

@ -26,132 +26,195 @@
</u-tabs> </u-tabs>
</u-sticky> </u-sticky>
<uni-notice-bar show-icon scrollable text="安全生产！有序生产！高效生产！" /> <uni-notice-bar show-icon scrollable text="安全生产！有序生产！高效生产！" />
<el-collapse accordion v-if="current === 0"> <!-- 开工中-->
<el-collapse-item v-for="(item, index) in startList" :name="item.id" :key="index"> <view v-if="current === 0" class="container" >
<template #title> <u-list>
<el-icon><Tickets /></el-icon> <u-list-item
<el-text size="large">{{item.productName}}</el-text>&nbsp;/&nbsp; v-for="item in startList"
<el-text type="success">计划数:{{ item.planNumber }}</el-text> :key="item"
</template> >
<el-row> <view class="content">
<el-col :span="8"> <view class="header">
<el-text type="success">{{item.code}}</el-text>- <view class="title">
</el-col> <u-image
<el-col :span="12"> src="@/static/images/icon/product.png"
<el-text type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text> width="40rpx"
</el-col> height="40rpx"
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> />
<el-button type="success" plain @click="updatePlan(item.id, item.code,'end')">完工</el-button> <text class="name">
</el-col> {{ item.productName }}
</el-row> </text>
<el-row> </view>
<el-col :span="12"> <el-text type="success">{{item.code}}</el-text>
<el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text> </view>
</el-col> <view class="flex-box">
<el-col :span="8"> <el-text>计划数:{{ item.planNumber }}</el-text>
<el-text type="warning">入库数:{{ item.finishNumber }}</el-text> <el-text>入库数:{{ item.finishNumber }}</el-text>
</el-col> </view>
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <view class="flex-box">
<el-button type="warning" plain @click="updatePlan(item.id,item.code,'pause')">暂停</el-button> <el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
</view>
<view class="text">
<el-text>备注:</el-text>
</view>
<view class="remark">
<el-text>{{ item.remark }}</el-text>
</view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
<u-button type="success" plain @click="updatePlan(item.id, item.code,'end')">完工</u-button>
</el-col> </el-col>
</el-row> <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
<el-row> <u-button type="warning" plain @click="updatePlan(item.id,item.code,'pause')">暂停</u-button>
<el-col :span="20">
<el-text>备注:{{ item.remark }}</el-text>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button type="info" plain @click="planProgress(item)">进度</el-button> <u-button type="info" plain @click="planProgress(item)">进度</u-button>
</el-col> </el-col>
</el-row> </view>
</el-collapse-item> </view>
</el-collapse> </u-list-item>
</u-list>
</view>
<!-- 派工中--> <!-- 派工中-->
<el-collapse accordion v-if="current === 1"> <view v-if="current === 1" class="container" >
<el-collapse-item v-for="(item, index) in paigongList" :name="item.id" :key="index"> <u-list>
<template #title> <u-list-item
<el-icon><Tickets /></el-icon> v-for="item in dispatch"
<el-text size="large">{{item.productName}}</el-text>&nbsp;/&nbsp; :key="item"
<el-text type="success">计划数:{{ item.planNumber }}</el-text> >
</template> <view class="content">
<el-row> <view class="header">
<el-col :span="8"> <view class="title">
<el-text type="success">{{item.code}}</el-text>- <u-image
</el-col> src="@/static/images/icon/product.png"
<el-col :span="12"> width="40rpx"
<el-text type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text> height="40rpx"
</el-col> />
<text class="name">
{{ item.productName }}
</text>
</view>
<el-text type="success">{{item.code}}</el-text>
</view>
<view class="flex-box">
<el-text>计划数:{{ item.planNumber }}</el-text>
<el-text>入库数:{{ item.finishNumber }}</el-text>
</view>
<view class="flex-box">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
</view>
<view class="text">
<el-text>备注:</el-text>
</view>
<view class="remark">
<el-text>{{ item.remark }}</el-text>
</view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
<el-button type="info" plain @click="updatePlan(item.id,item.code, 'start')">开工</el-button> <u-button type="info" plain @click="updatePlan(item.id,item.code, 'start')">开工</u-button>
</el-col> </el-col>
</el-row> </view>
<el-row> </view>
<el-col :span="12"> </u-list-item>
<el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text> </u-list>
</el-col> </view>
</el-row>
<el-text>备注:{{ item.remark }}</el-text>
</el-collapse-item>
</el-collapse>
<!-- 计划中--> <!-- 计划中-->
<el-collapse accordion v-if="current === 2"> <view v-if="current === 2" class="container" >
<el-collapse-item v-for="(item, index) in planList" :name="item.id" :key="index"> <u-list>
<template #title> <u-list-item
<el-icon><Tickets /></el-icon> v-for="item in planList"
<el-text size="large">{{item.productName}}</el-text>&nbsp;/&nbsp; :key="item"
<el-text type="success">计划数:{{ item.planNumber }}</el-text> >
</template> <view class="content">
<el-row> <view class="header">
<el-col :span="8"> <view class="title">
<el-text type="success">{{item.code}}</el-text>- <u-image
</el-col> src="@/static/images/icon/product.png"
<el-col :span="12"> width="40rpx"
<el-text type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text> height="40rpx"
</el-col> />
<text class="name">
{{ item.productName }}
</text>
</view>
<el-text type="success">{{item.code}}</el-text>
</view>
<view class="flex-box">
<el-text>计划数:{{ item.planNumber }}</el-text>
<el-text>入库数:{{ item.finishNumber }}</el-text>
</view>
<view class="flex-box">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
</view>
<view class="text">
<el-text>备注:</el-text>
</view>
<view class="remark">
<el-text>{{ item.remark }}</el-text>
</view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
<el-button type="primary" plain>派工</el-button> <u-button type="primary" plain>派工</u-button>
</el-col> </el-col>
</el-row> </view>
<el-row> </view>
<el-col :span="12"> </u-list-item>
<el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text> </u-list>
</el-col> </view>
</el-row>
<el-text>备注:{{ item.remark }}</el-text>
</el-collapse-item>
</el-collapse>
<!-- 暂停中 --> <!-- 暂停中 -->
<el-collapse accordion v-if="current === 3"> <view v-if="current === 3" class="container" >
<el-collapse-item v-for="(item, index) in pauseList" :name="item.id" :key="index"> <u-list>
<template #title> <u-list-item
<el-icon><Tickets /></el-icon> v-for="item in pauseList"
<el-text size="large">{{item.productName}}</el-text>&nbsp;/&nbsp; :key="item"
<el-text type="success">计划数:{{ item.planNumber }}</el-text> >
</template> <view class="content">
<el-row> <view class="header">
<el-col :span="8"> <view class="title">
<el-text type="success">{{item.code}}</el-text>- <u-image
</el-col> src="@/static/images/icon/product.png"
<el-col :span="12"> width="40rpx"
<el-text type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text> height="40rpx"
</el-col> />
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <text class="name">
<el-button type="success" plain @click="updatePlan(item.id,item.code, 'end')">完工</el-button> {{ item.productName }}
</el-col> </text>
</el-row> </view>
<el-row> <el-text type="success">{{item.code}}</el-text>
<el-col :span="12"> </view>
<el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text> <view class="flex-box">
</el-col> <el-text>计划数:{{ item.planNumber }}</el-text>
<el-col :span="8"> <el-text>入库数:{{ item.finishNumber }}</el-text>
<el-text type="warning">入库数:{{ item.finishNumber }}</el-text> </view>
<view class="flex-box">
<el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
<el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
</view>
<view class="text">
<el-text>备注:</el-text>
</view>
<view class="remark">
<el-text>{{ item.remark }}</el-text>
</view>
<view class="u-m-t-30 u-m-b-30"><u-line/></view>
<view class="u-flex justify-end">
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
<u-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</u-button>
</el-col> </el-col>
<el-col v-if="auth.hasPermi('mes:plan:update')" :span="4"> <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
<el-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</el-button> <u-button type="success" plain @click="updatePlan(item.id,item.code, 'end')">完工</u-button>
</el-col> </el-col>
</el-row> </view>
<el-text>备注:{{ item.remark }}</el-text> </view>
</el-collapse-item> </u-list-item>
</el-collapse> </u-list>
</view>
<!-- <view class="charts-box">--> <!-- <view class="charts-box">-->
<!-- <qiun-data-charts :chartData="chartData" type="column"/>--> <!-- <qiun-data-charts :chartData="chartData" type="column"/>-->
<!-- </view>--> <!-- </view>-->
@ -160,17 +223,15 @@
<script setup> <script setup>
import { ref, onMounted } from 'vue'; import { ref, onMounted } from 'vue';
import useUserStore from '@/store/modules/user'
import { updateStatus, getByStatus } from "@/api/mes/plan" import { updateStatus, getByStatus } from "@/api/mes/plan"
import { timestampToTime } from "@/utils/dateUtil"; import { timestampToTime } from "@/utils/dateUtil";
import { Tickets } from "@element-plus/icons-vue";
import modal from "@/plugins/modal"; import modal from "@/plugins/modal";
import tab from "@/plugins/tab"; import tab from "@/plugins/tab";
import {showConfirm} from "@/utils/common"; import { showConfirm } from "@/utils/common";
import auth from "@/plugins/auth"; import auth from "@/plugins/auth";
const userStore = useUserStore()
const startList = ref([]); const startList = ref([]);
const paigongList = ref([]); const dispatch = ref([]);
const pauseList = ref([]); const pauseList = ref([]);
const planList = ref([]); const planList = ref([]);
const chartData = ref({}); const chartData = ref({});
@ -198,6 +259,7 @@ onMounted(() => {
getServerData() getServerData()
getPlanList() getPlanList()
}); });
function getServerData() { function getServerData() {
// 模拟从服务器获取数据时的延时 // 模拟从服务器获取数据时的延时
setTimeout(() => { setTimeout(() => {
@ -223,7 +285,7 @@ function getPlanList() {
planList.value = response.data planList.value = response.data
}) })
getByStatus(1).then(response => { getByStatus(1).then(response => {
paigongList.value = response.data dispatch.value = response.data
}) })
getByStatus(2).then(response => { getByStatus(2).then(response => {
startList.value = response.data startList.value = response.data
@ -244,7 +306,6 @@ function updatePlan(id, planCode, type){
if (res.confirm) { if (res.confirm) {
const data = {'id':id, 'code':type} const data = {'id':id, 'code':type}
updateStatus(data).then(response => { updateStatus(data).then(response => {
console.log(response)
getPlanList() getPlanList()
}) })
modal.msgSuccess("操作成功") modal.msgSuccess("操作成功")
@ -275,4 +336,52 @@ function planProgress(plan){
width: 100%; width: 100%;
height: 300px; height: 300px;
} }
.container {
background-color: #f1f1f1;
padding: 0 20rpx 20rpx 20rpx;
.content {
margin: 20rpx 0;
padding: 20rpx;
background-color: #ffffff;
border-radius: 10rpx;
.header {
display: flex;
align-items: center;
justify-content: space-between;
.title {
display: flex;
align-items: center;
.name {
font-size: 28rpx;
font-weight: bold;
margin-left: 16rpx;
color: #333333;
}
}
}
.flex-box {
margin-top: 20rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
}
.text {
margin-top: 20rpx;
}
.remark {
margin-top: 20rpx;
display: flex;
align-items: center;
padding: 20rpx;
background-color: #f5f7f9;
border-radius: 10rpx;
font-size: 24rpx;
color: #555555;
}
.u-button {
height: 60rpx
}
}
}
</style> </style>

BIN
src/static/images/icon/product.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 691 B

Write Preview
Loading…
Cancel
Save