Merge branch 'main-cq' of http://192.168.0.56:3000/hywen/SmartStorage into main-cq

manifest.json

@@ -29,8 +29,8 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    // "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    // "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
@@ -44,15 +44,15 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
-                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
+                    // "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+                    // "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
                     "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\\\" />",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\\\" />",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\\\" />",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\\\" />"
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\\\" />"
                 ]
             },
+            // "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\\\" />",
+            // "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\\\" />"
             /* ios打包配置 */
             "ios" : {
                 "dSYMs" : false,

pages/workSpace/workSpace.vue

@@ -6,7 +6,8 @@
         </view>
         <h4 class="tit">业务办理</h4>
         <view class="secs">
-            <!--   <view  重庆不需要领料申请
+            <!-- 重庆不需要领料申请 -->
+            <view
                 @click="jumpUrl('fetchMaterial')"
                 v-if="
                     store.includes('picking:apply:apply') ||
@@ -14,7 +15,7 @@
                 ">
                 <image src="/static/fetchMaterial.png" mode=""></image>
                 <span>领料申请</span>
-            </view> -->
+            </view>
             <view
                 @click="jumpUrl('exitMaterial')"
                 v-if="

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/0c114b20-7d8f-11ef-8759-952981b5c6a0
+https://app.liuyingyong.cn/build/download/2608de80-927f-11ef-be3d-f1d610f550a6

unpackage/dist/dev/app-plus/app-view.js

@@ -2821,9 +2821,33 @@ var render = function () {
                 },
                 [
                   _c("v-uni-image", {
-                    attrs: { src: "/static/exitMaterial.png", mode: "", _i: 6 },
+                    attrs: {
+                      src: "/static/fetchMaterial.png",
+                      mode: "",
+                      _i: 6,
+                    },
                   }),
-                  _c("span", { attrs: { _i: 7 } }, [_vm._v("退料申请")]),
+                  _c("span", { attrs: { _i: 7 } }, [_vm._v("领料申请")]),
+                ],
+                1
+              )
+            : _vm._e(),
+          _vm._$g(8, "i")
+            ? _c(
+                "uni-view",
+                {
+                  attrs: { _i: 8 },
+                  on: {
+                    click: function ($event) {
+                      return _vm.$handleViewEvent($event)
+                    },
+                  },
+                },
+                [
+                  _c("v-uni-image", {
+                    attrs: { src: "/static/exitMaterial.png", mode: "", _i: 9 },
+                  }),
+                  _c("span", { attrs: { _i: 10 } }, [_vm._v("退料申请")]),
                 ],
                 1
               )
@@ -2831,13 +2855,13 @@ var render = function () {
         ],
         1
       ),
-      _c("h4", { staticClass: _vm._$g(8, "sc"), attrs: { _i: 8 } }, [
+      _c("h4", { staticClass: _vm._$g(11, "sc"), attrs: { _i: 11 } }, [
         _vm._v("移动办公"),
       ]),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(9, "sc"), attrs: { _i: 9 } },
-        _vm._l(_vm._$g(10, "f"), function (part, index, $20, $30) {
+        { staticClass: _vm._$g(12, "sc"), attrs: { _i: 12 } },
+        _vm._l(_vm._$g(13, "f"), function (part, index, $20, $30) {
           return _c(
             "uni-view",
             {
@@ -2845,12 +2869,12 @@ var render = function () {
                 {
                   name: "show",
                   rawName: "v-show",
-                  value: _vm._$g("10-" + $30, "v-show"),
-                  expression: "_$g((\"10-\"+$30),'v-show')",
+                  value: _vm._$g("13-" + $30, "v-show"),
+                  expression: "_$g((\"13-\"+$30),'v-show')",
                 },
               ],
               key: part,
-              attrs: { _i: "10-" + $30 },
+              attrs: { _i: "13-" + $30 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -2860,13 +2884,13 @@ var render = function () {
             [
               _c("v-uni-image", {
                 attrs: {
-                  src: _vm._$g("11-" + $30, "a-src"),
+                  src: _vm._$g("14-" + $30, "a-src"),
                   mode: "",
-                  _i: "11-" + $30,
+                  _i: "14-" + $30,
                 },
               }),
-              _c("span", { attrs: { _i: "12-" + $30 } }, [
-                _vm._v(_vm._$g("12-" + $30, "t0-0")),
+              _c("span", { attrs: { _i: "15-" + $30 } }, [
+                _vm._v(_vm._$g("15-" + $30, "t0-0")),
               ]),
             ],
             1
@@ -2874,31 +2898,13 @@ var render = function () {
         }),
         1
       ),
-      _c("h4", { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } }, [
+      _c("h4", { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } }, [
         _vm._v("查询"),
       ]),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
+        { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
         [
-          _c(
-            "uni-view",
-            {
-              attrs: { _i: 15 },
-              on: {
-                click: function ($event) {
-                  return _vm.$handleViewEvent($event)
-                },
-              },
-            },
-            [
-              _c("v-uni-image", {
-                attrs: { src: "/static/searchProjUsing.png", mode: "", _i: 16 },
-              }),
-              _c("span", { attrs: { _i: 17 } }, [_vm._v("工程在用")]),
-            ],
-            1
-          ),
           _c(
             "uni-view",
             {
@@ -2909,15 +2915,33 @@ var render = function () {
                 },
               },
             },
+            [
+              _c("v-uni-image", {
+                attrs: { src: "/static/searchProjUsing.png", mode: "", _i: 19 },
+              }),
+              _c("span", { attrs: { _i: 20 } }, [_vm._v("工程在用")]),
+            ],
+            1
+          ),
+          _c(
+            "uni-view",
+            {
+              attrs: { _i: 21 },
+              on: {
+                click: function ($event) {
+                  return _vm.$handleViewEvent($event)
+                },
+              },
+            },
             [
               _c("v-uni-image", {
                 attrs: {
                   src: "/static/searchFetchRecord.png",
                   mode: "",
-                  _i: 19,
+                  _i: 22,
                 },
               }),
-              _c("span", { attrs: { _i: 20 } }, [_vm._v("领用记录")]),
+              _c("span", { attrs: { _i: 23 } }, [_vm._v("领用记录")]),
             ],
             1
           ),