From a4faf1a1ed7e7d2e1b89b4965e89843fbdfabc0e Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Tue, 19 Mar 2024 16:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/index.vue | 14 +-- .../newBuy/newDevices/newDevicesAccept.vue | 101 +++++++++++------- .../newBuy/newDevices/newDevicesArrival.vue | 9 +- .../newBuy/newDevices/newDevicesList.vue | 2 +- .../newDevices/newDevicesWarehousing.vue | 9 +- sgzb-ui/src/views/system/notice/index.vue | 7 +- sgzb-ui/vue.config.js | 2 +- 7 files changed, 80 insertions(+), 64 deletions(-) diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue index a0ed35b5..a1ef1aaa 100644 --- a/sgzb-ui/src/views/index.vue +++ b/sgzb-ui/src/views/index.vue @@ -300,13 +300,13 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { - this.reset(); - const dictId = row.dictId || this.ids - getType(dictId).then(response => { - this.form = response.data; - this.open = true; - this.title = "修改字典类型"; - }); + // this.reset(); + // const dictId = row.dictId || this.ids + // getType(dictId).then(response => { + // this.form = response.data; + // this.open = true; + // this.title = "修改字典类型"; + // }); }, /** 提交按钮 */ submitForm: function() { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue index c2bc3b54..7923099b 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue @@ -131,7 +131,7 @@ { - item.noticeUser = item.userId; - item.phone = item.telphone; - }) - let param = { - message:this.nform.notice, - taskId:this.taskInfo.taskId, - bmNoticeInfoList:this.configUserList, - } - if(this.configUserList.length>0){ - bmNoticeInfo(param).then(response=>{ - console.log(response) - if(response.code==200){ - this.$message({ - message: '操作成功', - type: 'success' - }) - this.noticeOpen = false - this.getTaskInfo() + this.$refs["nform"].validate(valid => { + if (valid) { + this.configUserList.forEach((item,index)=>{ + item.noticeUser = item.userId; + item.phone = item.telphone; + }) + let param = { + message:this.nform.notice, + taskId:this.taskInfo.taskId, + bmNoticeInfoList:this.configUserList, } + if(this.configUserList.length>0){ + bmNoticeInfo(param).then(response=>{ + console.log(response) + if(response.code==200){ + this.$message({ + message: '操作成功', + type: 'success' + }) + this.noticeOpen = false + this.getTaskInfo() + } - }) - }else{ - this.$message({ - message: '请选择通知人员！', - type: 'error' }) - } - - + }else{ + this.$message({ + message: '请选择通知人员！', + type: 'error' + }) + } + } + }) + }, // 多选框选中数据 handleSelectionChange(selection) { @@ -533,22 +537,37 @@ export default { }, /** 验收按钮操作 */ handleCheck(row) { - let rowData = row - rowData.checkNum = rowData.purchaseNum; - rowData.checkResult = rowData.checkResult || "通过"; - // this.fileList = [] - // this.checkUrlList = [] - // this.checkUrlNameList = [] - this.form = rowData; + // console.log(row) + this.$set(this.form,'code',row.code) + this.$set(this.form,'companyId',row.companyId) + this.$set(this.form,'createBy',row.createBy) + this.$set(this.form,'createTime',row.createTime) + this.$set(this.form,'id',row.id) + this.$set(this.form,'machineTypeName',row.machineTypeName) + this.$set(this.form,'manageType',row.manageType) + this.$set(this.form,'specificationType',row.specificationType) + this.$set(this.form,'typeName',row.typeName) + this.$set(this.form,'machineTypeName',row.machineTypeName) + this.$set(this.form,'taskId',row.taskId) + this.$set(this.form,'typeId',row.typeId) + this.$set(this.form,'checkResult',row.checkResult|| "通过") + // this.$set(this.form,'machineTypeName',row.machineTypeName) + this.$set(this.form,'purchaseNum',row.purchaseNum) + this.$set(this.form,'checkNum',row.purchaseNum) + this.$set(this.form,'checkUrl','') + this.$set(this.form,'checkUrlName','') + this.fileList = [] + this.checkUrlList = [] + this.checkUrlNameList = [] this.open = true; this.title = "验收"; }, /** 批量验收按钮操作 */ handleListCheck() { // console.log(this.ids) - // this.fileList1 = []; - // this.checkUrlList1 = [] - // this.checkUrlNameList1 = [] + this.fileList1 = []; + this.checkUrlList1 = [] + this.checkUrlNameList1 = [] this.aform = { checkResult:'通过', checkUrl:'', @@ -593,7 +612,7 @@ export default { item.checkUrl = this.aform.checkUrl item.checkUrlName = this.aform.checkUrlName }) - console.log(this.ids) + // console.log(this.ids) let equipments = this.ids console.log(equipments) this.$refs["aform"].validate(valid => { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue index 7a0ed5a7..1cbed490 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue @@ -496,20 +496,19 @@ export default { if(this.equipmentList.length>0){ this.$refs["maForm"].validate(valid => { if (valid) { - - console.log(this.maForm,'maForm') - console.log(this.equipmentList,'equipmentList') + // console.log(this.maForm,'maForm') + // console.log(this.equipmentList,'equipmentList') let isEmpty = true this.equipmentList.forEach(item=>{ if(item.purchaseNum=='' || !item.purchaseNum){ isEmpty = false } }) - console.log(this.taskId) + // console.log(this.taskId) this.maForm.taskId = this.taskId this.maForm.checkDetailsList = this.equipmentList; - console.log(this.maForm) + // console.log(this.maForm) if(isEmpty){ if(this.equipmentList.length>0){ this.$modal.confirm('是否确认保存当前页面').then(function() { }).then(() => { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue index 29fea513..4c4103b2 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue @@ -431,7 +431,7 @@ export default { diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue index 2ffe70e7..891d4b87 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue @@ -42,7 +42,7 @@ - + diff --git a/sgzb-ui/src/views/system/notice/index.vue b/sgzb-ui/src/views/system/notice/index.vue index d0b9e0ca..71e5da18 100644 --- a/sgzb-ui/src/views/system/notice/index.vue +++ b/sgzb-ui/src/views/system/notice/index.vue @@ -78,6 +78,11 @@ prop="noticeTitle" :show-overflow-tooltip="true" /> + + + - +