首页新增查看按钮跳转对应页面并携带参数

sgzb-ui/package.json

@@ -1,96 +1,96 @@
 {
-  "name": "ruoyi",
+    "name": "ruoyi",
-  "version": "3.6.3",
+    "version": "3.6.3",
-  "description": "机具管理系统",
+    "description": "机具管理系统",
-  "author": "机具",
+    "author": "机具",
-  "license": "MIT",
+    "license": "MIT",
-  "scripts": {
+    "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+        "dev": "vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+        "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+        "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
+        "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
+        "lint": "eslint --ext .js,.vue src"
-  },
+    },
-  "husky": {
+    "husky": {
-    "hooks": {
+        "hooks": {
-      "pre-commit": "lint-staged"
+            "pre-commit": "lint-staged"
-    }
+        }
-  },
+    },
-  "lint-staged": {
+    "lint-staged": {
-    "src/**/*.{js,vue}": [
+        "src/**/*.{js,vue}": [
-      "eslint --fix",
+            "eslint --fix",
-      "git add"
+            "git add"
+        ]
+    },
+    "keywords": [
+        "vue",
+        "admin",
+        "dashboard",
+        "element-ui",
+        "boilerplate",
+        "admin-template",
+        "management-system"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
+    },
+    "dependencies": {
+        "@riophae/vue-treeselect": "0.4.0",
+        "axios": "0.24.0",
+        "clipboard": "2.0.8",
+        "core-js": "3.25.3",
+        "echarts": "5.4.0",
+        "element-ui": "2.15.13",
+        "file-saver": "^2.0.5",
+        "fuse.js": "6.4.3",
+        "highlight.js": "9.18.5",
+        "html2canvas": "^1.4.1",
+        "js-beautify": "1.13.0",
+        "js-cookie": "3.0.1",
+        "jsencrypt": "3.0.0-rc.1",
+        "jszip": "^3.10.1",
+        "nprogress": "0.2.0",
+        "qrcodejs2": "0.0.2",
+        "quill": "1.3.7",
+        "screenfull": "5.0.2",
+        "sortablejs": "1.10.2",
+        "uuid": "^9.0.1",
+        "vue": "2.6.12",
+        "vue-count-to": "1.0.13",
+        "vue-cropper": "0.5.5",
+        "vue-easy-print": "0.0.8",
+        "vue-json-excel": "^0.3.0",
+        "vue-meta": "2.4.0",
+        "vue-router": "3.4.9",
+        "vuedraggable": "2.24.3",
+        "vuex": "3.6.0"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "4.4.6",
+        "@vue/cli-plugin-eslint": "4.4.6",
+        "@vue/cli-service": "4.4.6",
+        "babel-eslint": "10.1.0",
+        "babel-plugin-dynamic-import-node": "2.3.3",
+        "chalk": "4.1.0",
+        "compression-webpack-plugin": "5.0.2",
+        "connect": "3.6.6",
+        "eslint": "7.15.0",
+        "eslint-plugin-vue": "7.2.0",
+        "lint-staged": "10.5.3",
+        "runjs": "4.4.2",
+        "sass": "1.32.13",
+        "sass-loader": "10.1.1",
+        "script-ext-html-webpack-plugin": "2.1.5",
+        "svg-sprite-loader": "5.1.1",
+        "vue-template-compiler": "2.6.12"
+    },
+    "engines": {
+        "node": ">=8.9",
+        "npm": ">= 3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions"
     ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "core-js": "3.25.3",
-    "echarts": "5.4.0",
-    "element-ui": "2.15.13",
-    "file-saver": "^2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "html2canvas": "^1.4.1",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "jszip": "^3.10.1",
-    "nprogress": "0.2.0",
-    "qrcodejs2": "0.0.2",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "uuid": "^9.0.1",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-easy-print": "0.0.8",
-    "vue-json-excel": "^0.3.0",
-    "vue-meta": "2.4.0",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
 }

sgzb-ui/prettier.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+    tabWidth: 4,
+    semi: false,
+    vueIndentScriptAndStyle: true,
+    singleQuote: true,
+    trailingComma: 'all',
+    proseWrap: 'never',
+    htmlWhitespaceSensitivity: 'strict',
+    endOfLine: 'auto',
+}

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

@@ -729,6 +729,17 @@
                 })
             },
         },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
+        },
     }
 </script>
 

sgzb-ui/src/views/claimAndRefund/return/returnApply.vue

@@ -568,7 +568,7 @@
         getUnitData,
         getProData,
         getAgreementInfoById,
-        getUseNumByTypeId
+        getUseNumByTypeId,
     } from '@/api/claimAndRefund/receive.js'
     import dialogForm from './dialogForm.vue'
     import Tree from './tree.vue'
@@ -779,7 +779,7 @@
                     if (valid) {
                         let backApplyInfo = []
                         for (let i = 0; i < this.loadingList.length; i++) {
-                            this.loadingList[i].companyId = this.companyId;
+                            this.loadingList[i].companyId = this.companyId
                         }
                         backApplyInfo.push({
                             backPerson: '张三',
@@ -882,11 +882,12 @@
                 getViewByApply(params).then((res) => {
                     console.log(res)
                     this.loadingList = res.data.rows
-                    this.loadingList.forEach(item=>{
+                    this.loadingList.forEach((item) => {
-                        getUseNumByTypeId({ typeId:item.typeId }).then(res=>{
+                        getUseNumByTypeId({ typeId: item.typeId }).then(
-                            item.useNum = res.data
+                            (res) => {
-                        })
+                                item.useNum = res.data
-                       
+                            },
+                        )
                     })
                     this.loadingTotal = res.data.total
                 })
@@ -967,6 +968,17 @@
                 this.deptOptions = res.data
             },
         },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
+        },
     }
 </script>
 <style lang="scss" scoped>

sgzb-ui/src/views/index.vue

@@ -173,19 +173,22 @@
                 align="center"
                 class-name="small-padding fixed-width"
             >
-                <template slot-scope="scope">
+                <template slot-scope="{ row }">
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
+                        @click="handlePreview(row.taskTypeId, row.taskCode)"
                         >查 看</el-button
                     >
+
+                    <!-- 代办事件为新购任务时显示催办按钮 -->
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
-                        @click="handleUpdate(scope.row)"
+                        v-if="row.taskTypeId == 23"
+                        @click="handleUpdate(row.taskTypeId)"
                         >催 办</el-button
                     >
                     <!--          <el-button-->
@@ -316,6 +319,30 @@
                         },
                     ],
                 },
+
+                /* 列表查看跳转的路由地址 */
+                previewRouterList: [
+                    /* 新购任务 */
+                    {
+                        taskTypeId: 23,
+                        routerPath: 'store/newBuy/newDevicesList',
+                    },
+                    /* 领料任务 */
+                    {
+                        taskTypeId: 29,
+                        routerPath: 'claimAndRefund/receive/receiveManage',
+                    },
+                    /* 退料任务 */
+                    {
+                        taskTypeId: 36,
+                        routerPath: 'claimAndRefund/return/returnApply',
+                    },
+                    /* 维修任务 */
+                    {
+                        taskTypeId: 41,
+                        routerPath: 'repairTest/repair/repair',
+                    },
+                ],
             }
         },
         created() {
@@ -447,6 +474,21 @@
                     this.$store.dispatch('dict/cleanDict')
                 })
             },
+
+            /**
+             * 列表查看操作===========================================================
+             */
+            handlePreview(id, key) {
+                const [routerInfo] = this.previewRouterList.filter(
+                    (e) => e.taskTypeId == id,
+                )
+                this.$router.push({
+                    path: routerInfo.routerPath,
+                    query: {
+                        keyWord: key,
+                    },
+                })
+            },
         },
     }
 </script>

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

@@ -672,6 +672,17 @@
                 )
             },
         },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
+        },
     }
 </script>
 <style lang="scss" scoped>

sgzb-ui/vue.config.js

@@ -42,11 +42,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`, //超
+        target: `http://10.40.92.14:8080`, //福
-        // target: `http://10.40.92.253:8080`,//韩
-        // target: `http://10.40.92.209:8080`,//川/
-        target: `http://10.40.92.153:8080`, //帅
-        // target: `http://10.40.92.14:8080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
@@ -147,10 +143,10 @@ module.exports = {
       });
 
       config.optimization.runtimeChunk("single"),
-        {
+      {
-          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+        from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
-          to: "./", //到根目录下
+        to: "./", //到根目录下
-        };
+      };
     });
   },
 };