优化用户权限以及页面等样式问题

sgzb-ui/.env.production

@@ -1,6 +1,8 @@
 # 页面标题
 VUE_APP_TITLE = 施工装备管理系统
 
+NODE_ENV = production
+
 # 生产环境配置
 ENV = 'production'
 

sgzb-ui/.env.production-nw

@@ -1,10 +0,0 @@
-# 南网系统配置
-
-# 页面标题
-VUE_APP_TITLE = 施工装备管理系统
-
-# 生产环境配置
-ENV = 'production-nw'
-
-# 若依管理系统/生产环境
-VUE_APP_BASE_API = '/gl/dev-api'

sgzb-ui/.env.testing

@@ -1,10 +1,10 @@
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
-NODE_ENV = production
+NODE_ENV = testing
 
 # 测试环境配置
-ENV = 'staging'
+ENV = 'testing'
 
 # 若依管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/dev-api'

sgzb-ui/bin/build-prod.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>dist<73>ļ<EFBFBD><C4BC><EFBFBD>
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:prod
+
+pause

sgzb-ui/bin/build-text.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>dist<73>ļ<EFBFBD><C4BC><EFBFBD>
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:test
+
+pause

sgzb-ui/package.json

@@ -7,7 +7,8 @@
     "scripts": {
         "dev": "vue-cli-service serve",
         "build": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
+        "build:test": "vue-cli-service build --mode testing", 
+        "build:prod": "vue-cli-service build --mode production",
         "preview": "node build/index.js --preview",
         "lint": "eslint --ext .js,.vue src"
     },

sgzb-ui/src/utils/globalUrl.js

@@ -4,7 +4,7 @@
 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
 
-const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
 
 export default {
   qrUrl,

sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue

@@ -168,6 +168,7 @@
                         type="primary"
                         v-if="scope.row.taskStatus != 35"
                         @click="handleOut(scope.row)"
+                        v-hasPermi="['picking:outbound']"
                     >
                         出库
                     </el-button>

sgzb-ui/src/views/repairTest/repair/index.vue

@@ -238,6 +238,7 @@
                         icon="el-icon-setting"
                         v-if="scope.row.repairStatusCode == '43'"
                         @click="handleUpdate(scope.row, 'update')"
+                         v-hasPermi="['service:button']"
                     >
                         维修
                     </el-button>

sgzb-ui/src/views/repairTest/testExamine/index.vue

@@ -136,6 +136,7 @@
                     size="mini"
                     :disabled="multiple"
                     @click="checkClick"
+                    v-hasPermi="['service:batch:auditing']"
                     >批量审核</el-button
                 >
             </el-col>
@@ -244,6 +245,7 @@
                         icon="el-icon-circle-check"
                         v-if="scope.row.taskStatus == 46"
                         @click="handleUpdate(scope.row, 'update')"
+                        v-hasPermi="['service:auditing']"
                         >审核</el-button
                     >
                 </template>
@@ -754,24 +756,24 @@
 </template>
 
 <script>
-import {
+    import {
         getQuestListApi,
         getRepairAuditListApi,
         addDetailsAuditApi,
         getRepairRecord,
         getPartRecord,
-} from '@/api/repairTest/testExamine'
+    } from '@/api/repairTest/testExamine'
-import { getProjectList } from '@/api/claimAndRefund/receive'
+    import { getProjectList } from '@/api/claimAndRefund/receive'
-import {
+    import {
         getUnitInfoSelectApi,
         getProjectSelectApi,
         getDicSelectApi,
         listPartTypeApi,
         getMaTypeSelectApi,
-} from '@/api/repairTest/repair'
+    } from '@/api/repairTest/repair'
-import selectTree from '../repair/selectTree.vue'
+    import selectTree from '../repair/selectTree.vue'
-import Tree from '@/views/repairTest/repair/tree.vue'
+    import Tree from '@/views/repairTest/repair/tree.vue'
-export default {
+    export default {
         name: 'TestExamine',
         components: { Tree, selectTree },
         dicts: ['sys_normal_disable'],
@@ -1246,10 +1248,10 @@ export default {
                 )
             },
         },
-}
+    }
 </script>
 <style lang="scss" scoped>
-.submit_box {
+    .submit_box {
         display: flex;
         justify-content: flex-start;
         align-items: center;
@@ -1269,9 +1271,9 @@ export default {
                 font-size: 12px;
             }
         }
-}
+    }
 
-.submit_box_two {
+    .submit_box_two {
         display: flex;
         flex-direction: row;
         flex-wrap: nowrap;
@@ -1285,23 +1287,23 @@ export default {
             font-size: 18px;
             font-weight: 600;
         }
-}
+    }
 
-::v-deep.el-table .fixed-width .el-button--mini {
+    ::v-deep.el-table .fixed-width .el-button--mini {
         width: 70px !important;
         margin-bottom: 6px;
-}
+    }
 
-.dialog-footer-btn {
+    .dialog-footer-btn {
         display: flex;
         align-items: center;
         justify-content: flex-end;
-}
+    }
 
-.submit_box_openFour {
+    .submit_box_openFour {
         display: flex;
         justify-content: center;
         align-content: center;
         font-size: 18px;
-}
+    }
 </style>

sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue

@@ -63,6 +63,7 @@
                     size="mini"
                     v-if="data.taskStatus === 121 || data.taskStatus === 120"
                     @click="handleAuditing(data)"
+                    v-hasPermi="['forecast:waste:auditing']"
                     >审核</el-button
                 >
             </template>

sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue

@@ -21,9 +21,12 @@
                             icon="el-icon-circle-check"
                             size="mini"
                             @click="handelSubmitScrap"
+                            v-hasPermi="['submit:batch:scrap']"
                             >提交报废</el-button
                         >
 
+                        <!-- 批量提交报废 -->
+
                         <el-button
                             type="success"
                             plain
@@ -75,7 +78,7 @@
                         type="text"
                         size="mini"
                         v-if="data.taskStatus == 124"
-                        v-hasPermi="['scrap:auditing']"
+                        v-hasPermi="['submit:scrap']"
                         @click="handleSubmitScrap(data)"
                         >提交报废</el-button
                     >

sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue

@@ -18,6 +18,7 @@
                         plain
                         size="mini"
                         @click="handleBatchDisposition()"
+                        v-hasPermi="['scrap:batch:disposition']"
                         >批量处置</el-button
                     >
                     <el-button
@@ -69,6 +70,7 @@
                     type="text"
                     @click="handleDisposition(data)"
                     v-if="data.disposition == 0"
+                    v-hasPermi="['scrap:disposition']"
                 >
                     处置
                 </el-button>

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue

@@ -243,6 +243,7 @@
                             scope.row.manageType != '1'
                         "
                         @click="handleCode(scope.row)"
+                        v-hasPermi="['coding:manage']"
                         >编码管理</el-button
                     >
                     <el-button

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue

@@ -184,6 +184,7 @@
                             scope.row.taskStatus == '105'
                         "
                         @click="handleUpdate(scope.row)"
+                        v-hasPermi="['warehousing:auditing']"
                         >审核</el-button
                     >
                     <el-button
@@ -526,15 +527,15 @@
 </template>
 
 <script>
-import { getTypeList } from '@/api/store/warehousing'
+    import { getTypeList } from '@/api/store/warehousing'
-import {
+    import {
         getPutInList,
         getPutinDetailsList,
         changePutinStatus,
         warehousingEntry,
-} from '@/api/store/newBuy'
+    } from '@/api/store/newBuy'
-import vueEasyPrint from 'vue-easy-print'
+    import vueEasyPrint from 'vue-easy-print'
-export default {
+    export default {
         // name: "NewDevicesWarehousing",
         // dicts: ['sys_normal_disable'],
         components: { vueEasyPrint },
@@ -843,10 +844,10 @@ export default {
                 )
             },
         },
-}
+    }
 </script>
 <style lang="scss" scoped>
-.print {
+    .print {
         width: 90%;
         padding-left: 5%;
         padding-right: 1%;
@@ -875,10 +876,10 @@ export default {
             display: flex;
             justify-content: space-between;
         }
-}
+    }
 
-::v-deep.el-table .fixed-width .el-button--mini {
+    ::v-deep.el-table .fixed-width .el-button--mini {
         width: 60px !important;
         margin-bottom: 10px;
-}
+    }
 </style>

sgzb-ui/src/views/store/warehousing/repairWarehousing.vue

@@ -181,6 +181,7 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-if="scope.row.taskStatus == '入库进行中'"
+                        v-hasPermi="['repairTest:auditing']"
                         >审核</el-button
                     >
                     <!--          <el-button-->