From f4068ec6679be2c3ec0d157072b3b625c984b5e4 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 15 Apr 2024 18:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=90=BA=E5=B8=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/package.json | 186 +++++++++--------- sgzb-ui/prettier.config.js | 10 + .../claimAndRefund/receive/receiveManage.vue | 11 ++ .../claimAndRefund/return/returnApply.vue | 26 ++- sgzb-ui/src/views/index.vue | 48 ++++- .../newBuy/newDevices/newDevicesList.vue | 11 ++ sgzb-ui/vue.config.js | 14 +- 7 files changed, 194 insertions(+), 112 deletions(-) create mode 100644 sgzb-ui/prettier.config.js diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json index 2a39c062..cc57ca39 100644 --- a/sgzb-ui/package.json +++ b/sgzb-ui/package.json @@ -1,96 +1,96 @@ { - "name": "ruoyi", - "version": "3.6.3", - "description": "机具管理系统", - "author": "机具", - "license": "MIT", - "scripts": { - "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" + "name": "ruoyi", + "version": "3.6.3", + "description": "机具管理系统", + "author": "机具", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve", + "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "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" - ] } diff --git a/sgzb-ui/prettier.config.js b/sgzb-ui/prettier.config.js new file mode 100644 index 00000000..df4d29ed --- /dev/null +++ b/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', +} diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue index d4052392..92d8699b 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue +++ b/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, + }, + }, } diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue index 231480e8..ed026941 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue +++ b/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=>{ - getUseNumByTypeId({ typeId:item.typeId }).then(res=>{ - item.useNum = res.data - }) - + this.loadingList.forEach((item) => { + getUseNumByTypeId({ typeId: item.typeId }).then( + (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, + }, + }, }