From 57981b50afe2de80e22eafbd6edb045d572c13d0 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Wed, 20 Dec 2023 20:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=90=8E=E5=8F=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9-1220-zzy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/.env.production | 4 +- sgzb-ui/src/api/system/upload.js | 42 ++++ .../base/assetAttributeAllocation/index.vue | 6 +- sgzb-ui/src/views/base/comeAndGo/index.vue | 1 - .../claimAndRefund/receive/agreement.vue | 10 +- .../newBuy/newDevices/newDevicesArrival.vue | 3 + .../newBuy/newDevices/newDevicesList.vue | 34 ++-- .../src/views/store/shelves/shelvesList.vue | 33 ++-- sgzb-ui/src/views/store/tools/devices.vue | 3 + sgzb-ui/src/views/store/tools/keeper.vue | 4 +- sgzb-ui/src/views/store/tools/repair.vue | 4 +- .../src/views/store/tools/toolsSupplier.vue | 74 ++++++- sgzb-ui/src/views/store/tools/toolsType.vue | 186 ++++++++++++++---- sgzb-ui/src/views/system/post/index.vue | 6 +- 14 files changed, 324 insertions(+), 86 deletions(-) create mode 100644 sgzb-ui/src/api/system/upload.js diff --git a/sgzb-ui/.env.production b/sgzb-ui/.env.production index b4893b0d..512859c3 100644 --- a/sgzb-ui/.env.production +++ b/sgzb-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 施工装备管理系统 # 生产环境配置 ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = '/dev-api' diff --git a/sgzb-ui/src/api/system/upload.js b/sgzb-ui/src/api/system/upload.js new file mode 100644 index 00000000..4560e702 --- /dev/null +++ b/sgzb-ui/src/api/system/upload.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' +//资源图片上传 +export function imgUpLoad(param){ + const formData = new FormData() + formData.append('file', param.file) + formData.append('fileType', param.type) + return request({ + url: '/system/sys/file/upload', + method: 'post', + data: formData, + header:'multipart/form-data' + }) + } + +//资源文件上传 +export function fileUpLoad(param){ + const formData = new FormData() + formData.append('file', param.file) + return request({ + url: '/system/sys/file/upload', + method: 'post', + data: formData, + }) + } + + + + + + + + + + + + + + + + + + diff --git a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue index 8e22687b..c6dbf8f7 100644 --- a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue +++ b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue @@ -331,8 +331,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.typeId); - + this.ids = selection.map(item => item); console.log(this.ids) }, /** 保存按钮操作 */ @@ -342,7 +341,8 @@ export default { if(this.chosenPropId && this.ids.length>0){ let param = { propId:this.chosenPropId, - typeId:this.ids[0] + typeId:this.ids[0].typeId, + propName:this.ids[0].propName, } savePropInfo(param).then(response => { if(response.code == 200){ diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue index da4e0a1d..69a60262 100644 --- a/sgzb-ui/src/views/base/comeAndGo/index.vue +++ b/sgzb-ui/src/views/base/comeAndGo/index.vue @@ -33,7 +33,6 @@ plain icon="el-icon-edit" size="mini" - :disabled="single" @click="handlePeople" >人员配置 diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 0727c139..01bb76ce 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -162,20 +162,20 @@ - - + + 新增 - + @@ -261,6 +260,11 @@ export default { // this.reset(); // this.open = true; // this.title = "添加字典类型"; + }, + /** 修改按钮操作 */ + handleUpdate(row) { + let query = { taskId:row.taskId } + this.$router.replace({ path: "/store/newBuy/newDevicesArrival", query }); }, // 多选框选中数据 handleSelectionChange(selection) { @@ -268,17 +272,17 @@ export default { this.single = selection.length!=1 this.multiple = !selection.length }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.$router.replace("/store/newBuy/newDevicesArrival"); - // this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - // this.open = true; - // this.title = "修改字典类型"; - // }); - }, + // /** 修改按钮操作 */ + // handleUpdate(row) { + // this.$router.replace("/store/newBuy/newDevicesArrival"); + // // this.reset(); + // // const dictId = row.dictId || this.ids + // // getType(dictId).then(response => { + // // this.form = response.data; + // // this.open = true; + // // this.title = "修改字典类型"; + // // }); + // }, /** 提交按钮 */ submitForm: function() { this.$refs["form"].validate(valid => { diff --git a/sgzb-ui/src/views/store/shelves/shelvesList.vue b/sgzb-ui/src/views/store/shelves/shelvesList.vue index 35279b11..a352a66c 100644 --- a/sgzb-ui/src/views/store/shelves/shelvesList.vue +++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue @@ -66,7 +66,7 @@ v-hasPermi="['system:dept:edit']" >编辑 - - + + @@ -148,7 +148,7 @@ export default { data() { return { // 遮罩层 - loading: true, + loading: false, // 显示搜索条件 showSearch: true, // 表格树数据 @@ -172,7 +172,7 @@ export default { form: {}, // 表单校验 rules: { - deptId: [ + parentId: [ { required: true, message: "上级部门不能为空", trigger: "blur" } ], houseName: [ @@ -181,13 +181,14 @@ export default { sort: [ { required: true, message: "显示排序不能为空", trigger: "blur" } ], - phone: [ - { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur" - } - ] + // phone: [ + // { required: true, message: "手机号码不能为空", trigger: "blur" }, + // // { + // // pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + // // message: "请输入正确的手机号码", + // // trigger: "blur" + // // } + // ] } }; }, @@ -200,7 +201,7 @@ export default { this.loading = true; listHouse(this.queryParams).then(response => { console.log(response) - this.houseList = this.handleTree(response.rows, "houseId"); + this.houseList = this.handleTree(response.data, "houseId"); this.loading = false; }); }, @@ -224,7 +225,7 @@ export default { reset() { this.form = { houseId: undefined, - deptId: undefined, + parentId: undefined, houseName: undefined, sort: undefined, concat: undefined, @@ -247,12 +248,12 @@ export default { handleAdd(row) { this.reset(); if (row != undefined) { - this.form.deptId = row.houseId; + this.form.parentId = row.houseId; } this.open = true; this.title = "新建"; listHouse().then(response => { - this.deptOptions = this.handleTree(response.rows, "houseId"); + this.deptOptions = this.handleTree(response.data, "houseId"); }); }, /** 展开/折叠操作 */ diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue index 7d6124f7..8002a483 100644 --- a/sgzb-ui/src/views/store/tools/devices.vue +++ b/sgzb-ui/src/views/store/tools/devices.vue @@ -274,6 +274,9 @@