From 3be3fd24ebf24295d1e571bc9ba9c1e5e1308148 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 29 May 2024 10:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=86=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/receive/receiveManage.vue    |  8 +++++++-
 .../views/claimAndRefund/receive/receiveOut.vue | 10 ++--------
 sgzb-ui/vue.config.js                           | 17 +++++++++--------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 64e7092a..7f951336 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -210,7 +210,10 @@
                         type="primary"
                         @click="handleExamine(scope.row)"
                         v-hasPermi="['receive:examine:fgs']"
-                        v-if="Number(scope.row.examineStatusId) == 30"
+                        v-if="
+                            Number(scope.row.examineStatusId) == 30 &&
+                            scope.row.deptId == currentDeptId
+                        "
                         >审批</el-button
                     >
                     <el-button
@@ -526,6 +529,9 @@ export default {
             leaseApplyDetails: [],
             // 领料任务详情数据
             leaseApplyData: {},
+
+            // 当前用户所属部门Id
+            currentDeptId: parseInt(sessionStorage.getItem('deptId')),
         }
     },
     created() {
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index da580aa1..a9452aeb 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -385,7 +385,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (outQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
@@ -489,17 +489,12 @@
                     prop="alNum"
                     :show-overflow-tooltip="true"
                 />
-                <el-table-column
-                    label="出库数量"
-                    align="center"
-                    prop="inputNum"
-                >
+                <el-table-column label="出库数量" align="center">
                     <template slot-scope="scope">
                         <el-input
                             v-model.number="scope.row.inputNum"
                             placeholder="请输入出库数量"
                             type="number"
-                            min="1"
                             @input="checkNum(scope.row)"
                             clearable
                             style="width: 100%"
@@ -813,7 +808,6 @@ export default {
             if (row.inputNum <= 1) {
                 row.inputNum = 1
             }
-
             if (row.inputNum > row.outNum && row.num >= maxNum) {
                 row.inputNum = maxNum
             }
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index a9ef72d5..fd5dfd04 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -19,7 +19,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', ///gl/
+  publicPath: process.env.NODE_ENV === 'production' ? '/gl/' : '/', ///gl/
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -34,6 +34,7 @@ module.exports = {
     port: port,
     open: true,
     proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://112.29.103.165:21626`, //线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
@@ -42,11 +43,11 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:28080`, //超
+        // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         target: `http://10.40.92.136:28080`, //帅
-        // target: `http://10.40.92.253:28080`, //福
+        // target: `http://10.40.92.5:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
@@ -146,11 +147,11 @@ module.exports = {
         },
       })
 
-      config.optimization.runtimeChunk("single"),
+      config.optimization.runtimeChunk('single'),
       {
-        from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
-        to: "./", //到根目录下
-      };
-    });
+        from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+        to: './', //到根目录下
+      }
+    })
   },
 }