From 0e0ee08c70b99de5f02274fe415a2cf95b6a7feb Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 27 Feb 2024 15:59:13 +0800
Subject: [PATCH] =?UTF-8?q?2.27=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 228 ++++++++++--------
 .../quality/Materialinspection/index.vue      |  23 +-
 src/pages/quality/Materialinspection/web.vue  |  27 +++
 src/pages/shouye/me.vue                       |   2 +-
 4 files changed, 172 insertions(+), 108 deletions(-)
 create mode 100644 src/pages/quality/Materialinspection/web.vue

diff --git a/src/pages.json b/src/pages.json
index aefefe7..918fc42 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -8,248 +8,264 @@
       "path": "pages/login/login/index",
       "style": {
         "navigationBarTitleText": "登录",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/shouye/index",
       "style": {
         "navigationBarTitleText": "首页",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/shouye/me",
       "style": {
         "navigationBarTitleText": "我的",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/index",
       "style": {
         "navigationBarTitleText": "wms菜单",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/index",
       "style": {
         "navigationBarTitleText": "mes菜单",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/index",
       "style": {
         "navigationBarTitleText": "设备管理",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/equipmentlist",
       "style": {
         "navigationBarTitleText": "设备列表",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Inspection/index",
       "style": {
         "navigationBarTitleText": "巡检",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Inspection/details",
       "style": {
         "navigationBarTitleText": "巡检详情",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Inspection/detailsview",
       "style": {
         "navigationBarTitleText": "巡检查看",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Spotcheck/index",
       "style": {
         "navigationBarTitleText": "点检",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Spotcheck/details",
       "style": {
         "navigationBarTitleText": "点检详情",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Spotcheck/detailsview",
       "style": {
         "navigationBarTitleText": "点检查看",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Upkeep/index",
       "style": {
         "navigationBarTitleText": "保养",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Upkeep/details",
       "style": {
         "navigationBarTitleText": "保养详情",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Upkeep/repairing",
       "style": {
         "navigationBarTitleText": "保养中",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Upkeep/repairingview",
       "style": {
         "navigationBarTitleText": "保养查看",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Upkeep/Sparepartlist",
       "style": {
         "navigationBarTitleText": "保养申领",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repair/index",
       "style": {
         "navigationBarTitleText": "维修",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repair/details",
       "style": {
         "navigationBarTitleText": "维修详情",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repair/repairing",
       "style": {
         "navigationBarTitleText": "维修中",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repair/repairingview",
       "style": {
         "navigationBarTitleText": "维修查看",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repair/Sparepartlist",
       "style": {
         "navigationBarTitleText": "备件申领",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/equipment/Repairbx/index",
       "style": {
         "navigationBarTitleText": "报修",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/index",
       "style": {
         "navigationBarTitleText": "质量管理",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Belowstandard/index",
       "style": {
         "navigationBarTitleText": "不合格处置",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Inspectionitem/index",
       "style": {
         "navigationBarTitleText": "检验项目",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Inspectionrule/index",
       "style": {
         "navigationBarTitleText": "检验规则",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Inspectionunit/index",
       "style": {
         "navigationBarTitleText": "检验单位",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Materialinspection/index",
       "style": {
         "navigationBarTitleText": "质量检验",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/quality/Materialinspection/web",
+      "style": {
+        "navigationBarTitleText": "扫描内容",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/quality/Materialinspection/index",
+      "style": {
+        "navigationBarTitleText": "质量检验",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/quality/Records/index",
       "style": {
         "navigationBarTitleText": "历史记录",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
@@ -268,170 +284,172 @@
       "path": "pages/mes/ProductionQtyInsp/index",
       "style": {
         "navigationBarTitleText": "生产质检",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/ProductionQtyInsp/listdata",
       "style": {
         "navigationBarTitleText": "生产质检",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/ProductionQtyInsp/detail",
       "style": {
         "navigationBarTitleText": "生产质检详细",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/ReceiveSRM/index",
       "style": {
         "navigationBarTitleText": "采购收货SRM",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/ReceiveSRM/detail",
       "style": {
         "navigationBarTitleText": "采购收货SRM详细",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/ReceivePO/index",
       "style": {
         "navigationBarTitleText": "采购收货PO",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/ReceivePO/detail",
       "style": {
         "navigationBarTitleText": "采购收货PO详细",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/PurchaseWHSRM/index",
       "style": {
         "navigationBarTitleText": "采购入库SRM",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/PurchaseWHSRM/detail",
       "style": {
         "navigationBarTitleText": "采购入库SRM详细",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/PurchaseWHPO/index",
       "style": {
         "navigationBarTitleText": "采购入库PO",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/PurchaseWHPO/detail",
       "style": {
         "navigationBarTitleText": "采购入库PO详细",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/Requisition/index",
       "style": {
         "navigationBarTitleText": "生产领料",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/product/SaleOutWH/index",
       "style": {
         "navigationBarTitleText": "成品销售出库",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/product/OfflineStorage/index",
       "style": {
         "navigationBarTitleText": "成品下线入库",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/PalletChange/index",
       "style": {
         "navigationBarTitleText": "下机台设置",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/ChangePalletNew/index",
       "style": {
         "navigationBarTitleText": "托盘变更",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/mes/Pallethandling/index",
       "style": {
         "navigationBarTitleText": "异常托盘处理",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/ProductionREQ/index",
       "style": {
         "navigationBarTitleText": "生产领料",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/TrayStatusUpdate/index",
       "style": {
         "navigationBarTitleText": "托盘状态更新",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/SpecifyPalletOut/index",
       "style": {
         "navigationBarTitleText": "包材指定托盘出库",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     },
     {
       "path": "pages/wms/Raw/MatReturnWH/index",
       "style": {
         "navigationBarTitleText": "包材半托返库",
-        "navigationStyle": "custom", 
-        "navigationBarTextStyle": "white" 
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
       }
     }
+    
+
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
@@ -439,4 +457,4 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   }
-}
+}
\ No newline at end of file
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index df8124e..bbde86e 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -7,6 +7,7 @@
       <view class="title">质量检验</view>
       <view class="right"></view>
     </view>
+
     <u-form class="form" ref="form" label-width="180rpx">
       <!-- 订单 -->
       <!-- <u-form-item label="检验节点"> -->
@@ -119,6 +120,8 @@
                 </u-radio-group>
               </div>
             </div>
+            <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons>
+            <!-- <uni-icons type="scan" size="35" @click="scanCodeOne2" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
             <div class="upload-name">
               <!-- <div class="name">检查标准:{{ form.item5 }}</div> -->
               <!-- <u-upload :before-upload="beforeUpload" ref="uUpload" :fileList="fileList" @on-error='errorUpload($event)' :action="action" @on-remove="removePic($event, item)" @on-success="successUpload($event)" :deletable="true"></u-upload> -->
@@ -325,6 +328,7 @@ export default class PurchaseWHSRM extends BasePage {
   files: any = [];
   DefectListPDAlist: any = [];
   defectCodelist: any = [];
+  imgurl: any = 'http://lj08.cn/21201501124240221021300171390045';
   //收货按钮
   tagClick(index) {
     this.tagslist.splice(index, 1);
@@ -344,9 +348,12 @@ export default class PurchaseWHSRM extends BasePage {
     //   this.isfocus = true;
     // });
   }
+  onShow() {
+    console.log('222221');
+  }
   async onLoad(options) {
     this.getselectlist();
-
+    console.log(options);
     if (options.listitem) {
       let str = decodeURIComponent(options.listitem);
       if (str) {
@@ -786,16 +793,28 @@ export default class PurchaseWHSRM extends BasePage {
     console.log(this.detaillistceshi[index]);
   }
   scanCodeOne() {
+    // http://lj08.cn/21201501124240221021300171390045
     uni.scanCode({
-      scanType: ['barCode'],
+      // scanType: ['barCode'],
       success: (res) => {
+        console.log(res.result, 'ssss');
         this.orderNo = res.result;
+        uni.navigateTo({
+          url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(res.result),
+        });
       },
       fail(result) {
         this.customToast(result);
       },
     });
   }
+  scanCodeOne2() {
+    // http://lj08.cn/21201501124240221021300171390045
+    let result: any = 'https://wx.hlcode.cn/?id=NEVVLoo';
+    uni.navigateTo({
+      url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(result),
+    });
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages/quality/Materialinspection/web.vue b/src/pages/quality/Materialinspection/web.vue
new file mode 100644
index 0000000..4db9b91
--- /dev/null
+++ b/src/pages/quality/Materialinspection/web.vue
@@ -0,0 +1,27 @@
+<template>
+  <view class="page-product-receipt">
+    <web-view :src="imgurl" style="width: 100%; height: 100%"></web-view>
+  </view>
+</template>
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+//import { any } from 'lodash/fp';
+@Component({
+  components: {},
+})
+export default class PurchaseWHSRM extends BasePage {
+  imgurl: any = '';
+  //收货按钮
+  onShow() {
+    // console.log('222221',);
+  }
+  async onLoad(options) {
+    console.log(options);
+    if (options.listitem) {
+      this.imgurl = options.listitem;
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 9883965..ebe3b80 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.42';
+  version = '0.0.43';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {