From 58001af180842783407d08108289a692b89d20b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 14 Aug 2023 15:42:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AEbug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inventory/DeviceProjectSelect.vue | 3 +-
.../inventory/DeviceRepairOrderModify.vue | 30 ++++++++-----------
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/inventory/DeviceProjectSelect.vue b/src/views/inventory/DeviceProjectSelect.vue
index 1707505d..89a1570a 100644
--- a/src/views/inventory/DeviceProjectSelect.vue
+++ b/src/views/inventory/DeviceProjectSelect.vue
@@ -139,7 +139,8 @@ export default {
projectSetType: {
1: "巡检",
- 2: "养护"
+ 2: "养护",
+ 3: "报修",
},
formName: null,
deviceRepairOrder: {},
diff --git a/src/views/inventory/DeviceRepairOrderModify.vue b/src/views/inventory/DeviceRepairOrderModify.vue
index a3c2c4d8..b283eb2b 100644
--- a/src/views/inventory/DeviceRepairOrderModify.vue
+++ b/src/views/inventory/DeviceRepairOrderModify.vue
@@ -209,11 +209,9 @@
-
-
@@ -292,7 +290,6 @@ export default {
formRules: {
deptCode: [{required: true, message: '请选择部门', trigger: 'blur'}],
invCode: [{required: true, message: '请选择仓库', trigger: 'blur'}],
- deviceName: [{required: true, message: '请输入设备名称', trigger: 'blur'}],
code: [{required: true, message: '请输入物资编码', trigger: 'blur'}],
repairType: [{required: true, message: '请选择维修类型', trigger: 'blur'}],
urgencyType: [{required: true, message: '请选择紧急程度', trigger: 'blur'}],
@@ -423,22 +420,19 @@ export default {
this.filterQuery.page = 1;
this.getDeviceList();
},
- handleCurrentChange(val) {
- this.check = !this.check
- if (val.length >= 2) {
- // 删除索引为0的
- // console.log(val.splice(0,val.length-1),'被删除的')
- let arrays = val.splice(0, val.length - 1)
- arrays.forEach(row => {
- this.$refs.ref.toggleRowSelection(row); //除了当前点击的，其他的全部取消选中
- })
+ handleCurrentChange(row) {
+ this.selectRow = row;
+ },
+ // 刷新表单
+ resetForm() {
+ if (this.$refs["dataForm"]) {
+ // 清空验证信息表单
+ this.$refs["dataForm"].clearValidate();
}
- // console.log(val,'最后得到的')
-
- this.selectRow = val[0];
},
combine() {
- if (this.check == false) {
+ this.resetForm();
+ if (this.selectRow == null) {
this.$message.error("请勾选设备!")
return;
}
From dcfcf4b51d99d4cc3d99705725b68ad94011e8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 14 Aug 2023 17:54:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inventory/deviceInspectTake.js | 9 +
src/views/inventory/DeviceInspectMyTake.vue | 63 +++---
.../inventory/DeviceInspectPlanModify.vue | 6 +-
src/views/inventory/DeviceInspectTakeAdd.vue | 192 ++++++++++--------
.../DeviceInspectTakeAuditModify.vue | 22 +-
.../inventory/DeviceInspectTakeProjectSet.vue | 2 +-
6 files changed, 153 insertions(+), 141 deletions(-)
diff --git a/src/api/inventory/deviceInspectTake.js b/src/api/inventory/deviceInspectTake.js
index 5345a878..c88c9f8e 100644
--- a/src/api/inventory/deviceInspectTake.js
+++ b/src/api/inventory/deviceInspectTake.js
@@ -56,6 +56,15 @@ export function addDeviceInspecTakeDetail(params) {
});
}
+export function delectDeviceInspecTake(data) {
+ return axios({
+ url: "/udiwms/inv/device/inspect/take/delectDeviceInspecTake",
+ method: "post",
+ data: data
+ });
+}
+
+
diff --git a/src/views/inventory/DeviceInspectMyTake.vue b/src/views/inventory/DeviceInspectMyTake.vue
index d0307447..3427c803 100644
--- a/src/views/inventory/DeviceInspectMyTake.vue
+++ b/src/views/inventory/DeviceInspectMyTake.vue
@@ -28,42 +28,18 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
@@ -104,8 +81,6 @@
{{ statusMap[scope.row.status] }}
-
-
@@ -125,6 +100,13 @@
>详情
+ 删除
+
@@ -227,7 +209,11 @@
import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import deviceInspectTakeAuditModify from "@/views/inventory/DeviceInspectTakeAuditModify"
-import {getDeviceInspectTakeList,selectDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake";
+import {
+ delectDeviceInspecTake,
+ getDeviceInspectTakeList,
+ selectDeviceInspecTakeDetail
+} from "@/api/inventory/deviceInspectTake";
import {previewImage, previewFile} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DeviceInspectTakeDetail from "@/views/inventory/DeviceInspectTakeDetail"
@@ -404,7 +390,7 @@ export default {
deptCode: this.$store.getters.locDeptCode,
invCode: null,
code: null,
- statusList: [0,1,2],
+ statusList: [0,1],
page: 1,
limit: 20,
};
@@ -463,7 +449,6 @@ export default {
this.formName="add"
this.addTakeDetial = true;
},
-
deptChange() {
this.invList = [];
this.filterQuery.invCode = null;
@@ -506,9 +491,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- let params = {id: rowId};
+ let params = {id: rowId.id};
this.loading = true;
- deleteInspectPlan(params).then((res) => {
+ delectDeviceInspecTake(params).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.$message.success("删除成功！");
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index 3c9d8f21..34a95fd6 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -98,15 +98,15 @@
-
+
-
+
-
+
diff --git a/src/views/inventory/DeviceInspectTakeAdd.vue b/src/views/inventory/DeviceInspectTakeAdd.vue
index 07eff59c..5e8c9288 100644
--- a/src/views/inventory/DeviceInspectTakeAdd.vue
+++ b/src/views/inventory/DeviceInspectTakeAdd.vue
@@ -2,10 +2,10 @@
-
+
选择设备
提交
@@ -15,7 +15,7 @@
-
-
-
-
+
+
-
-
-
+ >
+
+
+
@@ -158,7 +158,7 @@
@@ -171,10 +171,12 @@
- 选入
+
+ 选入
+
-
+
新增
@@ -196,7 +198,7 @@
-
+
编辑
详情
@@ -225,31 +227,30 @@
-
@@ -290,11 +291,11 @@
@@ -349,7 +350,7 @@ export default {
invList: [],
userList: [],
imgList: [],
- name:'',
+ name: '',
BASE_URL: process.env.VUE_APP_BASE_API,
editType: null,
deviceDialogVisible: false,
@@ -373,7 +374,7 @@ export default {
updateTime: null,
taskOrderIdFk: null
},
- ischeck:false,
+ ischeck: false,
deviceList: [],
delectList: [],
deviceTotal: 0,
@@ -382,15 +383,15 @@ export default {
selectRow: null,
imgViewerVisible: false,
inspectTakeSetVisible: false,
- inspectSelectPlanSetVisible:false,
- rules:{
- deptCode: [{required: true, message:"请选择部门!",trigger: 'blur'}],
- invCode: [{required: true, message:"请选择仓库!",trigger: 'blur'}],
- deviceName: [{required: true, message:"请输入设备名称!",trigger: 'blur'}],
- code: [{required: true, message:"请输入物资编码!",trigger: 'blur'}],
- type: [{required: true, message:"请选择类型!",trigger: 'blur'}],
- repairType: [{required: true, message:"请选择维修类型!",trigger: 'blur'}],
- level: [{required: true, message:"请选择紧急程度!",trigger: 'blur'}],
+ inspectSelectPlanSetVisible: false,
+ rules: {
+ deptCode: [{required: true, message: "请选择部门!", trigger: 'blur'}],
+ invCode: [{required: true, message: "请选择仓库!", trigger: 'blur'}],
+ deviceName: [{required: true, message: "请输入设备名称!", trigger: 'blur'}],
+ code: [{required: true, message: "请输入物资编码!", trigger: 'blur'}],
+ type: [{required: true, message: "请选择类型!", trigger: 'blur'}],
+ repairType: [{required: true, message: "请选择维修类型!", trigger: 'blur'}],
+ level: [{required: true, message: "请选择紧急程度!", trigger: 'blur'}],
},
statusMap: {
1: "未开始",
@@ -417,12 +418,12 @@ export default {
this.getInvList();
});
},
- repairType(val){
- if(val == 3){
+ repairType(val) {
+ if (val == 3) {
//报修
this.ischeck = true;
- }else
+ } else
this.ischeck = false;
},
@@ -437,21 +438,36 @@ export default {
});
},
submit() {
- if(this.formName == "add"){
- this.inspectTake.status = 1
- }else{
- this.inspectTake.status = 2
- }
- uploadDeviceTake(this.inspectTake).then((res) => {
- if (res.code === 20000) {
- this.$message.success("提交成功");
- this.closeDialog();
- } else {
- this.$message.error(res.message);
+
+ this.$refs["formRef"].validate((valid) => {
+ if (valid) {
+ if (this.formName == "add") {
+ this.inspectTake.status = 1
+ saveDeviceInspectTake(this.inspectTake,'add').then((res) => {
+ if (res.code === 20000) {
+ this.$message.success("提交成功");
+ this.closeDialog();
+ } else {
+ this.$message.error(res.message);
+ }
+ }).catch((error) => {
+ this.$message.error(error.message);
+ });
+ } else {
+ this.inspectTake.status = 2
+ uploadDeviceTake(this.inspectTake).then((res) => {
+ if (res.code === 20000) {
+ this.$message.success("提交成功");
+ this.closeDialog();
+ } else {
+ this.$message.error(res.message);
+ }
+ }).catch((error) => {
+ this.$message.error(error.message);
+ });
+ }
}
- }).catch((error) => {
- this.$message.error(error.message);
- });
+ })
},
onReset() {
@@ -501,15 +517,15 @@ export default {
setPlanFunction(row) {
if (this.inspectTake.orderId != null) { //edit
- if(isBlank(row)){
+ if (isBlank(row)) {
this.inputQuery = {};
this.inputQuery.status = 1;
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
- }else{
+ } else {
this.inputQuery = row
}
this.inspectTakeSetVisible = true;
- }else{ // add
+ } else { // add
this.inputQuery.status = 1;
this.inspectTake.type = this.inspectTake.type
this.inspectTake.status = 0;
@@ -531,17 +547,17 @@ export default {
},
- selectPlanFunction(row){
+ selectPlanFunction(row) {
if (this.inspectTake.orderId != null) { //edit
- if(isBlank(row)){
+ if (isBlank(row)) {
this.inputQuery = {};
this.inputQuery.taskOrderIdFk = this.inspectTake.orderId
this.inputQuery.projectCode = this.inspectTake.code
- }else{
+ } else {
this.inputQuery = row
}
this.inspectSelectPlanSetVisible = true;
- }else{
+ } else {
this.$refs["formRef"].validate((valid) => {
if (valid) {
this.inspectTake.type = this.inspectTake.type
@@ -567,7 +583,7 @@ export default {
}
},
- inspectPlanSetCloseDialog(){
+ inspectPlanSetCloseDialog() {
this.inspectPlanSetVisible = false;
this.inspectSelectPlanSetVisible = false;
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
@@ -676,7 +692,7 @@ export default {
}
,
components: {
- DeviceInspectTakeProjectSet, ElImageViewer,DeviceProjectSelectTake
+ DeviceInspectTakeProjectSet, ElImageViewer, DeviceProjectSelectTake
}
,
created() {
@@ -685,8 +701,8 @@ export default {
this.getUserBus();
if (!isBlank(this.inspectTake.id)) {
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
- if(this.inspectTake.type == 3){
- this.ischeck =true
+ if (this.inspectTake.type == 3) {
+ this.ischeck = true
}
}
}
diff --git a/src/views/inventory/DeviceInspectTakeAuditModify.vue b/src/views/inventory/DeviceInspectTakeAuditModify.vue
index 4a48f64d..c62caffb 100644
--- a/src/views/inventory/DeviceInspectTakeAuditModify.vue
+++ b/src/views/inventory/DeviceInspectTakeAuditModify.vue
@@ -469,21 +469,23 @@ export default {
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
- inspectTakeSetCloseDialog() {
+ inspectTakeSetCloseDialog(obj) {
+ this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
this.inspectTakeSetVisible = false
this.inspectSelectPlanSetVisible = false
- var count=0;
- if (this.type == 4) {
- for (var i = 0; i < this.delectList.length; i++) {
- if (this.delectList[i].status != 2) {
- count++;
+ if(isBlank(obj)){
+ var count=0;
+ if (this.type == 4) {
+ for (var i = 0; i < this.delectList.length; i++) {
+ if (this.delectList[i].status != 2) {
+ count++;
+ }
+ }
+ if(count == 0){
+ return this.$message.success("任务已全部完成")
}
- }
- if(count == 0){
- return this.$message.success("任务已全部完成")
}
}
- this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
}
}
,
diff --git a/src/views/inventory/DeviceInspectTakeProjectSet.vue b/src/views/inventory/DeviceInspectTakeProjectSet.vue
index be2fa002..a3091ca2 100644
--- a/src/views/inventory/DeviceInspectTakeProjectSet.vue
+++ b/src/views/inventory/DeviceInspectTakeProjectSet.vue
@@ -67,7 +67,7 @@
提交
- 取消
+ 取消