From 36a3daf99cee35c62ffdd0c1d732578c80cc4f22 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 8 Mar 2023 17:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6=E5=8F=B0?=
=?UTF-8?q?=E8=B4=A6=E3=80=81=E4=B8=8A=E8=A3=85=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/shangzhuang/shangzhuang.js | 9 +-
.../guachetaizhang/guachetaizhangAdd.vue | 9 +-
.../shangzhuangtaizhangAdd.vue | 40 +++---
.../shangzhuangtaizhangguanli.vue | 134 ++++++++++--------
4 files changed, 117 insertions(+), 75 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
index cf3b046861..4a4b25fe81 100644
--- a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
+++ b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
@@ -65,7 +65,7 @@ export default {
// 主车车架号(上装台账管理)
selExistingCar: function(data) {
return request({
- url: '/base/v1/basevehicle/selExistingCar',
+ url: '/base/v1/basevehicle/selVehByStockState',
method: 'post',
params: data
})
@@ -79,4 +79,11 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
+ // 出库
+ vehinstallOut: function(data) {
+ return request({
+ url: '/base/v1/basevehinstall/vehinstallOut/' + data,
+ method: 'post'
+ })
+ }
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
index 4a3a1fb87e..93291a7f2b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
@@ -615,10 +615,12 @@ export default {
this.submitdisabled = true
this.getUrl()
req.save(this.formobj).then((resp) => {
- this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
+ this.submitdisabled = false
this.handleReturn('true')
+ } else {
+ this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
@@ -639,14 +641,16 @@ export default {
this.submitdisabled = true
this.getUrl()
req.update(this.formobj, this.formobj.sid).then((resp) => {
- this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
+ this.submitdisabled = false
this.handleReturn('true')
+ } else {
+ this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
@@ -717,6 +721,7 @@ export default {
}
this.imgList = []
this.imgList2 = []
+ this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
index 866e105ab0..be4be4d56d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
@@ -4,7 +4,7 @@
@@ -297,22 +297,29 @@ export default {
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
- this.submitdisabled = true
- req.save(this.formobj).then((resp) => {
- this.submitdisabled = false
- if (resp.success) {
- this.$message({
- showClose: true,
- type: 'success',
- message: resp.msg
- })
- this.handleReturn('true')
- }
- }).catch(() => {
- this.submitdisabled = false
+ const tip = '请确认是否保存此次所填信息'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.submitdisabled = true
+ req.save(this.formobj).then((resp) => {
+ if (resp.success) {
+ this.$message({
+ showClose: true,
+ type: 'success',
+ message: resp.msg
+ })
+ this.submitdisabled = false
+ this.handleReturn('true')
+ } else {
+ this.submitdisabled = false
+ }
+ }).catch(() => {
+ this.submitdisabled = false
+ })
})
- } else {
- return false
}
})
},
@@ -356,6 +363,7 @@ export default {
moreConfig: ''
}
}
+ this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue
index 249b57b8a5..45a2a264ea 100644
--- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue
@@ -61,7 +61,7 @@
@@ -96,13 +96,13 @@
-
+
@@ -137,6 +137,13 @@ export default {
btnKey: 'toAdd',
btnLabel: '入库'
},
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toLeave',
+ btnLabel: '出库'
+ },
{
type: 'danger',
size: 'small',
@@ -240,8 +247,8 @@ export default {
case 'toAdd':
this.toAdd()
break
- case 'toEdit':
- this.toEdit()
+ case 'toLeave':
+ this.toLeave()
break
case 'doDel':
this.doDel()
@@ -253,6 +260,58 @@ export default {
break
}
},
+ // 序号
+ indexMethod(index) {
+ var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+ var pageindex = index + 1 + pagestart
+ return pageindex
+ },
+ handleSelectionChange(val) {
+ const aa = []
+ val.forEach((element) => {
+ aa.push(element.sid)
+ })
+ this.multipleSelection = aa
+ },
+ loadList() {
+ this.tableLoading = true
+ req.pagelist(this.queryParams).then((resp) => {
+ this.tableLoading = false
+ if (resp.success) {
+ const data = resp.data
+ this.queryParams.total = data.total
+ this.dataList = data.records
+ } else {
+ this.queryParams.total = 0
+ this.dataList = []
+ }
+ }).catch(() => {
+ this.tableLoading = false
+ })
+ },
+ dosearch() {
+ this.queryParams.current = 1
+ this.loadList()
+ },
+ resetQuery() {
+ this.queryParams = {
+ current: 1,
+ size: 5,
+ total: 0,
+ params: {
+ vehicleTypeKey: '',
+ installNameKey: '',
+ refitMethodKey: '',
+ refitFactorySid: '',
+ colorKey: '',
+ plateMaterial: '',
+ createOrgSid: '',
+ vinNo: '',
+ noticeModel: ''
+ }
+ }
+ this.init()
+ },
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.queryParams.params.createOrgSid)
@@ -270,11 +329,6 @@ export default {
})
return
}
- const _this = this
- const sids = []
- this.multipleSelection.forEach((row) => {
- sids.push(row.sid)
- })
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
@@ -287,64 +341,32 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
- req.delete(sids).then((resp) => {
+ req.delete(this.multipleSelection).then((resp) => {
loading.close()
- _this.$message({
+ this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
- _this.init()
+ this.loadList()
}).catch((e) => {
loading.close()
})
}).catch(() => {
})
},
- dosearch() {
- this.queryParams.current = 1
- this.init()
- },
- resetQuery() {
- this.queryParams = {
- current: 1,
- size: 5,
- total: 0,
- params: {
- vehicleTypeKey: '',
- installNameKey: '',
- refitMethodKey: '',
- refitFactorySid: '',
- colorKey: '',
- plateMaterial: '',
- createOrgSid: '',
- vinNo: '',
- noticeModel: ''
- }
+ toLeave() {
+ if (this.multipleSelection.length !== 1) {
+ this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行出库操作' })
+ return
+ } else {
+ req.vehinstallOut(this.multipleSelection[0]).then((resp) => {
+ if (resp.success) {
+ this.$message({ showClose: true, type: 'success', message: '出库成功' })
+ this.loadList()
+ }
+ })
}
- this.init()
- },
- loadList() {
- const _this = this
- this.tableLoading = true
- req.pagelist(this.queryParams).then((resp) => {
- _this.tableLoading = false
- const data = resp.data
- _this.queryParams.total = data.total
- _this.dataList = data.records
- }).catch(() => {
- _this.tableLoading = false
- })
- },
- handleSelectionChange(val) {
- console.log(val)
- this.multipleSelection = val
- },
- // 序号
- indexMethod(index) {
- var pagestart = (this.queryParams.current - 1) * this.queryParams.size
- var pageindex = index + 1 + pagestart
- return pageindex
},
toInfo(row) {
this.$refs['divinfo'].showInfo(row)