安卓

mes-ui/uni-app/.hbuilderx/launch.json

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

mes-ui/uni-app/src/manifest.json

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

mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue

@@ -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)
+        const data = await getAssembleReportByCodeApi(params)
-        console.log('data' + res.data);
+        listReport.value.push(data)
-        listReport.value.push(res.data)
       }
     }
   });

mes-ui/uni-app/src/pages/assembleReport/list.vue

@@ -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>

mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue

@@ -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)">
+          @click="handleToBooking(item)">
-          <image v-if="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
+          <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)">
+          @click="handleToBooking(item)">
-          <image v-if="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
+          <image v-show="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
         </view>
       </view>
     </template>

mes-ui/uni-app/src/pages/index/components/PageSkeleton.vue

@@ -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">
+            <view class="module CategoryPanel--module">
-              <image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
+              <view class="module-title CategoryPanel--module-title sk-transparent sk-text-14-2857-313 sk-text">质量模块
-            </view>
+              </view>
-            <view class="category-item CategoryPanel--category-item" hover-class="none">
+              <view class="category-item CategoryPanel--category-item" hover-class="none">
-              <image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
+                <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>
-            <view class="category-item CategoryPanel--category-item" hover-class="none">
+            <view class="module CategoryPanel--module">
-              <image class="icon CategoryPanel--icon sk-image" mode="aspectFit"></image>
+              <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>

mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue

@@ -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;
+      width: 300rpx;
-      border-radius: 10rpx;
+      border-radius: 20rpx;
-      padding: 8rpx 0;
+      padding: 14rpx 0;
       background-color: #3C8AF7;
       color: #fff;
     }

mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue

@@ -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;

mes-ui/uni-app/src/pages/unqualifiedNotification/unqualifiedNotification.vue

@@ -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>