yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安卓

Browse Source
dev
jevononlie 5 months ago
parent c6a01a4165
commit 4309bca264
28 changed files with 87 additions and 68 deletions
Show Stats Download Patch File Download Diff File

16
mes-ui/uni-app/.hbuilderx/launch.json
Unescape View File

@ -5,12 +5,14 @@
"playground" : "standard",
"type" : "uni-app:app-android"
},
{
"app-plus" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
{
"app-plus" : {
"launchtype" : "local"
},
"mp-weixin" : {
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}

46
mes-ui/uni-app/src/manifest.json
Unescape View File

@ -1,7 +1,7 @@
{
"name" : "高效生产",
"appid" : "__UNI__1AFEDCC",
"description" : "",
"description" : "美乐嘉",
"versionName" : "1",
"versionCode" : 1,
"transformPx" : false,
@ -54,33 +54,33 @@
},
"icons" : {
"android" : {
"hdpi" : "",
"xhdpi" : "",
"xxhdpi" : "",
"xxxhdpi" : ""
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "",
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "",
"app@2x" : "",
"notification" : "",
"notification@2x" : "",
"proapp@2x" : "",
"settings" : "",
"settings@2x" : "",
"spotlight" : "",
"spotlight@2x" : ""
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "",
"app@3x" : "",
"notification@2x" : "",
"notification@3x" : "",
"settings@2x" : "",
"settings@3x" : "",
"spotlight@2x" : "",
"spotlight@3x" : ""
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
},

8
mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue
Unescape View File

@ -12,8 +12,9 @@ const onSubmit = async () => {
try {
// 校验通过后再发送请求
const params = {
list: listReport.value,
taskReportAssembleVOList: listReport.value,
}
console.log(params)
const res = await postSubmitAssembleReportApi(params)
isLoading.value = false
@ -48,9 +49,8 @@ const onScan = async () => {
const params = {
assembleCode
}
const res = await getAssembleReportByCodeApi(params)
console.log('data' + res.data);
listReport.value.push(res.data)
const data = await getAssembleReportByCodeApi(params)
listReport.value.push(data)
}
}
});

3
mes-ui/uni-app/src/pages/assembleReport/list.vue
Unescape View File

@ -59,9 +59,8 @@ const onRefresherrefresh = async () => {
@refresherrefresh="onRefresherrefresh" @scrolltolower="getListData">
<view class="list-item" v-for="(item, index) in dataList" :key="item.dispatchId">
<view class="item-hd">
<view class="index">{{ index + 1 }}</view>
<view class="index">{{ dataList.length - index }}</view>
<view class="assembleCode">包装条形码：{{ item.assembleCode}}</view>
<view class="del" @tap="onDel(index)"><uni-icons type="trash" size="26"></uni-icons></view>
</view>
<view class="code label">产品编码: {{ item.projectSubCode }}</view>
<view class="name label">产品名称: {{ item.projectSubName }}</view>

14
mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: 王文杰
* @Date: 2024-03-04 14:13:16
* @LastEditors: jevononlie 728254585@qq.com
* @LastEditTime: 2024-05-10 14:47:12
* @LastEditTime: 2024-05-13 15:24:50
* @FilePath: /app-nx-personal/src/pages/index/components/CategoryPanel.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@ -36,18 +36,18 @@ const handleToBooking = (item: Object) => {
<template>
<view class="category">
<template v-if="list.length">
<view class="module" v-if="listZL.length">
<view class="module" v-show="listZL.length">
<view class="module-title">质量模块</view>
<view class="category-item" hover-class="none" v-for="item in listZL" :key="item.path"
@click="handleToBooking(item)">
<image v-if="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
@click="handleToBooking(item)">
<image v-show="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
</view>
</view>
<view class="module" v-if="listSC.length">
<view class="module" v-show="listSC.length">
<view class="module-title">生产模块</view>
<view class="category-item" hover-class="none" v-for="item in listSC" :key="item.path"
@click="handleToBooking(item)">
<image v-if="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
@click="handleToBooking(item)">
<image v-show="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
</view>
</view>
</template>

48
mes-ui/uni-app/src/pages/index/components/PageSkeleton.vue
Unescape View File

@ -1,14 +1,22 @@
<!--
此文件为开发者工具生成，生成时间: 2024/4/8下午6:04:22
* @Author: jevononlie 728254585@qq.com
* @Date: 2024-03-04 14:13:16
* @LastEditors: jevononlie 728254585@qq.com
* @LastEditTime: 2024-05-13 15:19:28
* @FilePath: /uni-app/src/pages/index/components/PageSkeleton.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!--
此文件为开发者工具生成，生成时间: 2024/5/13下午3:19:22
使用方法：
在 /Users/wangwenjie/chanko/mes-biz/mes-ui/mini-app/dist/dev/mp-weixin/pages/index/index.wxml 引入模板
在 /Users/wangwenjie/chanko/mes-majoys/mes-ui/uni-app/dist/dev/mp-weixin/pages/index/index.wxml 引入模板
```
<import src="index.skeleton.wxml"/>
<template is="skeleton" wx:if="{{loading}}" />
```
在 /Users/wangwenjie/chanko/mes-biz/mes-ui/mini-app/dist/dev/mp-weixin/pages/index/index.wxss 中引入样式
在 /Users/wangwenjie/chanko/mes-majoys/mes-ui/uni-app/dist/dev/mp-weixin/pages/index/index.wxss 中引入样式
```
@import "./index.skeleton.wxss";
```
@ -19,31 +27,39 @@
<view class="sk-container">
<view class="viewport viewport">
<view is="pages/index/components/CustomNavbar">
<view class="navbar CustomNavbar--navbar data-v-ff0d84a2 CustomNavbar--data-v-ff0d84a2" style="padding-top:57px">
<view class="navbar CustomNavbar--navbar data-v-ff0d84a2 CustomNavbar--data-v-ff0d84a2"
style="padding-top:57px">
<view class="logo CustomNavbar--logo data-v-ff0d84a2 CustomNavbar--data-v-ff0d84a2">
<image class="logo-image CustomNavbar--logo-image data-v-ff0d84a2 CustomNavbar--data-v-ff0d84a2 sk-image" mode="'aspectFit'"></image>
<image class="logo-image CustomNavbar--logo-image data-v-ff0d84a2 CustomNavbar--data-v-ff0d84a2 sk-image"
mode="'aspectFit'"></image>
</view>
</view>
</view>
<view class="cont cont">
<view is="pages/index/components/CategoryPanel">
<view class="category CategoryPanel--category">
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
<view class="module CategoryPanel--module">
<view class="module-title CategoryPanel--module-title sk-transparent sk-text-14-2857-313 sk-text">质量模块
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="scaleToFill"></image>
</view>
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
<view class="module CategoryPanel--module">
<view class="module-title CategoryPanel--module-title sk-transparent sk-text-14-2857-653 sk-text">生产模块
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="scaleToFill"></image>
</view>
<view class="category-item CategoryPanel--category-item" hover-class="none">
<image class="icon CategoryPanel--icon sk-image" mode="scaleToFill"></image>
</view>
</view>
</view>
</view>
<view is="pages/index/components/footRight">
<view class="copy-right footRight--copy-right sk-transparent sk-text-14-2857-199 sk-text">Copyright ©上海长江云息数字科技有限公司,All Rights Reserved. 专注工业信息化-供应链解决方案</view>
<view class="copy-right footRight--copy-right sk-transparent sk-text-14-2857-253 sk-text">Copyright
©上海长江云息数字科技有限公司,All Rights Reserved. 专注工业信息化-供应链解决方案</view>
</view>
</view>
</view>

8
mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue
Unescape View File

@ -553,7 +553,7 @@ const handleStop = async () => {
flex-direction: column;
align-items: center;
margin: 40rpx;
height: 50vh;
height: 40vh;
.item {
display: flex;
@ -586,9 +586,9 @@ const handleStop = async () => {
font-size: 32rpx;
margin: 20rpx auto 80rpx;
text-align: center;
width: 200rpx;
border-radius: 10rpx;
padding: 8rpx 0;
width: 300rpx;
border-radius: 20rpx;
padding: 14rpx 0;
background-color: #3C8AF7;
color: #fff;
}

10
mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue
Unescape View File

@ -3,7 +3,6 @@ import { toRaw, ref, onMounted } from 'vue'
import { formatDate } from '@/utils/index'
import { getApproveOrderAPI, getChildProductAPI } from '@/services/approveOrder'
import { getWorkshopsPageAPI, getProcedurePageAPI, getUserPageAPI, postAddAPI } from '@/services/unqualifiedNotification'
import { onLoad } from '@dcloudio/uni-app'
import { useLoginStore } from '@/stores/modules/login'
import mySelect from './mySelect.vue'
// 子调父
@ -31,7 +30,7 @@ const getTypeDictData = () => {
})
}
// 项目
let projectData = []
let projectData = ref([])
const getProjectData = async () => {
const params = {
pageNo: 1,
@ -48,7 +47,8 @@ const getProjectData = async () => {
}
arr.push(obj)
})
projectData = arr
console.log('projectData', res.list, arr)
projectData.value = arr
}
const projectChildData = ref([])
const getProjectChildData = async (projectOrderId) => {
@ -314,7 +314,9 @@ const selectConfirm = (val: string)=>{
<style lang="scss" scoped>
// 订单列表
.data-detail {
height: 80vh;
max-height: 60vh;
overflow: auto;
overflow: auto;
z-index: 9999;
padding: 20rpx 40rpx;
margin: 20rpx 20rpx;

2
mes-ui/uni-app/src/pages/unqualifiedNotification/unqualifiedNotification.vue
Unescape View File

@ -81,7 +81,7 @@ const handlePopClose = (flag) => {
<image class="add" src="/static/images/unqualifiedNotification-add.png" mode="scaleToFill" />
</view>
<!-- uni-ui 弹出层 -->
<uni-popup ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<uni-popup scroll-y="true" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<detailPanel v-if="isShowPop" @close="handlePopClose" />
</uni-popup>
</view>

BIN
mes-ui/uni-app/src/static/images/approveOrder.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
mes-ui/uni-app/src/static/images/logo-app.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/1024x1024.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/120x120.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/144x144.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/152x152.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/167x167.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/180x180.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/192x192.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/20x20.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/29x29.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/40x40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/58x58.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/60x60.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/72x72.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/76x76.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/80x80.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/87x87.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
mes-ui/uni-app/unpackage/res/icons/96x96.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Write Preview
Loading…
Cancel
Save