完善测试遇到的问题
This commit is contained in:
@@ -13,9 +13,9 @@ export default {
|
||||
|
||||
|
||||
// 修改是否可用状态
|
||||
updateIsEnable: function(sid,isEnable) {
|
||||
updateIsEnable: function(sid, isEnable) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouserack/updateIsEnable/'+sid+"/"+isEnable
|
||||
url: '/wms/apiadmin/warehouserack/updateIsEnable/' + sid + "/" + isEnable
|
||||
});
|
||||
},
|
||||
|
||||
@@ -37,5 +37,16 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
// 库位-- 删除
|
||||
deleteBySids: function(data) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouserack/delBySids',
|
||||
method: 'DELETE',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
@@ -8,7 +8,9 @@ export default {
|
||||
url: '/wms/apiadmin/warehouseinfo/listPage',
|
||||
method: 'post',
|
||||
data: params,
|
||||
headers: { 'Content-Type': 'application/json' }
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
// 仓库查询
|
||||
@@ -25,9 +27,9 @@ export default {
|
||||
|
||||
|
||||
// 修改是否可用状态
|
||||
updateIsEnable: function(sid,isEnable) {
|
||||
updateIsEnable: function(sid, isEnable) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouseinfo/updateStatus/'+sid+"/"+isEnable
|
||||
url: '/wms/apiadmin/warehouseinfo/updateStatus/' + sid + "/" + isEnable
|
||||
});
|
||||
},
|
||||
|
||||
@@ -38,7 +40,9 @@ export default {
|
||||
url: '/wms/apiadmin/warehouseinfo/saveOrUpdate',
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: { 'Content-Type': 'application/json' }
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@@ -50,5 +54,17 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
// 仓库-- 删除
|
||||
deleteBySids: function(data) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouseinfo/delBySids',
|
||||
method: 'DELETE',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -23,11 +23,24 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
// 根据仓库sid查询库区
|
||||
getAllWarehouseareaBysid: function(params) {
|
||||
return request({
|
||||
url: '/wms/apiadmin//warehousearea/selectAll',
|
||||
method: 'get',
|
||||
params: params,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
// 修改是否可用状态
|
||||
updateIsEnable: function(sid,isEnable) {
|
||||
updateIsEnable: function(sid, isEnable) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehousearea/updateIsEnable/'+sid+"/"+isEnable
|
||||
url: '/wms/apiadmin/warehousearea/updateIsEnable/' + sid + "/" + isEnable
|
||||
});
|
||||
},
|
||||
|
||||
@@ -49,5 +62,17 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
// 库区-- 删除
|
||||
deleteBySids: function(data) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehousearea/delBySids',
|
||||
method: 'DELETE',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -27,9 +27,9 @@ export default {
|
||||
|
||||
|
||||
// 修改是否可用状态
|
||||
updateIsEnable: function(sid,isEnable) {
|
||||
updateIsEnable: function(sid, isEnable) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouseareatype/updateIsEnable/'+sid+"/"+isEnable
|
||||
url: '/wms/apiadmin/warehouseareatype/updateIsEnable/' + sid + "/" + isEnable
|
||||
});
|
||||
},
|
||||
|
||||
@@ -51,6 +51,17 @@ export default {
|
||||
});
|
||||
},
|
||||
|
||||
// 库区类型-- 删除
|
||||
deleteBySids: function(data) {
|
||||
return request({
|
||||
url: '/wms/apiadmin/warehouseareatype/delBySids',
|
||||
method: 'DELETE',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
|
||||
<div v-show="isSearchShow" class="search">
|
||||
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
|
||||
<el-form-item label="供应商">
|
||||
<el-form-item label="厂商名称">
|
||||
<el-input v-model="listQuery.params.supplierName" placeholder="" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="分类">
|
||||
<el-form-item label="厂商类型">
|
||||
<el-input v-model="listQuery.params.supplierTypeName" placeholder="" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="办公电话">
|
||||
@@ -47,7 +47,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierName" label="厂商名称" align="center" />
|
||||
<el-table-column prop="supplierTypeName" label="厂商分类" align="center" />
|
||||
<el-table-column prop="supplierTypeName" label="厂商类型" align="center" />
|
||||
<el-table-column prop="address" label="厂商通讯地址" align="center" />
|
||||
<el-table-column prop="contactTelePhone" label="厂商办公电话" align="center" />
|
||||
<el-table-column prop="contactName" label="联系人" align="center" />
|
||||
|
||||
@@ -89,14 +89,29 @@
|
||||
this.warehouseList = resp.data
|
||||
})
|
||||
|
||||
req3.getAllWarehousearea(parpams).then(resp => {
|
||||
this.warehouseAreaList = resp.data
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
saveOrUpdate() {
|
||||
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
|
||||
|
||||
if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '所属仓库不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (this.formobj.locationName == '' || this.formobj.locationSid == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '所属仓区不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
req.saveGoodsShelves(this.formobj)
|
||||
.then(resp => {
|
||||
if (resp.success) {
|
||||
@@ -146,6 +161,18 @@
|
||||
console.log('>>>>>>>>>selectWarehouseChange', choose)
|
||||
this.formobj.warehouseSid = choose[0].sid
|
||||
this.formobj.warehouseName = choose[0].warehouseName
|
||||
|
||||
this.formobj.locationSid = ''
|
||||
this.formobj.locationName = ''
|
||||
|
||||
var params = {
|
||||
ckSid: choose[0].sid
|
||||
}
|
||||
|
||||
req3.getAllWarehouseareaBysid(params).then(resp => {
|
||||
this.warehouseAreaList = resp.data
|
||||
})
|
||||
|
||||
},
|
||||
selectWarehouseAreaChange(val) {
|
||||
const choose = this.warehouseAreaList.filter((item) => item.sid == val)
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
<!-- End 项目列表头部 -->
|
||||
<!-- Start 项目列表 -->
|
||||
<div class="">
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
|
||||
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
|
||||
@selection-change="selectionLineChangeHandle">
|
||||
<el-table-column fixed width="50" type="selection" align="center" />
|
||||
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
|
||||
<el-table-column label="操作" align="center" width="180">
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
|
||||
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
|
||||
@@ -91,6 +92,13 @@
|
||||
btnKey: 'toAdd',
|
||||
btnLabel: '新增'
|
||||
},
|
||||
{
|
||||
type: 'danger',
|
||||
size: 'small',
|
||||
icon: 'plus',
|
||||
btnKey: 'doDel',
|
||||
btnLabel: '删除'
|
||||
},
|
||||
{
|
||||
type: 'info',
|
||||
size: 'small',
|
||||
@@ -107,7 +115,8 @@
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
sids: []
|
||||
sids: [],
|
||||
selectionList: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -117,6 +126,17 @@
|
||||
this.loadList()
|
||||
},
|
||||
methods: {
|
||||
selectionLineChangeHandle(val) {
|
||||
console.log("val", val);
|
||||
|
||||
this.selectionList = val
|
||||
|
||||
const aa = []
|
||||
val.forEach(element => {
|
||||
aa.push(element.sid)
|
||||
})
|
||||
this.sids = aa
|
||||
},
|
||||
// 搜索条件效果
|
||||
clicksearchShow() {
|
||||
this.isSearchShow = !this.isSearchShow
|
||||
@@ -131,6 +151,9 @@
|
||||
case 'toAdd':
|
||||
this.toAdd()
|
||||
break
|
||||
case 'doDel':
|
||||
this.doDel()
|
||||
break
|
||||
case 'doClose':
|
||||
this.doClose()
|
||||
break
|
||||
@@ -185,6 +208,45 @@
|
||||
this.$refs['divadd'].showAdd()
|
||||
},
|
||||
|
||||
doDel() {
|
||||
|
||||
if (this.sids.length > 0) {
|
||||
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
|
||||
this.$confirm(tip, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: 'Loading',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
})
|
||||
req.deleteBySids(this.sids).then((resp) => {
|
||||
loading.close()
|
||||
if (resp.success) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: resp.msg,
|
||||
showClose: true
|
||||
})
|
||||
this.loadList()
|
||||
} else {
|
||||
// 根据resp.code进行异常情况处理
|
||||
}
|
||||
}).catch(e => {
|
||||
loading.close()
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: '请至少选择一条记录进行删除操作'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
doClose() {
|
||||
this.$store.dispatch('tagsView/delView', this.$route)
|
||||
this.$router.go(-1)
|
||||
|
||||
@@ -27,8 +27,9 @@
|
||||
<!-- End 项目列表头部 -->
|
||||
<!-- Start 项目列表 -->
|
||||
<div class="">
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
|
||||
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
|
||||
@selection-change="selectionLineChangeHandle">
|
||||
<el-table-column fixed width="50" type="selection" align="center" />
|
||||
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
@@ -94,6 +95,13 @@
|
||||
btnKey: 'toAdd',
|
||||
btnLabel: '新增'
|
||||
},
|
||||
{
|
||||
type: 'danger',
|
||||
size: 'small',
|
||||
icon: 'plus',
|
||||
btnKey: 'doDel',
|
||||
btnLabel: '删除'
|
||||
},
|
||||
{
|
||||
type: 'info',
|
||||
size: 'small',
|
||||
@@ -110,7 +118,8 @@
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
sids: []
|
||||
sids: [],
|
||||
selectionList: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -120,6 +129,19 @@
|
||||
this.loadList()
|
||||
},
|
||||
methods: {
|
||||
selectionLineChangeHandle(val) {
|
||||
console.log("val", val);
|
||||
|
||||
this.selectionList = val
|
||||
|
||||
const aa = []
|
||||
val.forEach(element => {
|
||||
aa.push(element.sid)
|
||||
})
|
||||
this.sids = aa
|
||||
|
||||
|
||||
},
|
||||
// 搜索条件效果
|
||||
clicksearchShow() {
|
||||
this.isSearchShow = !this.isSearchShow
|
||||
@@ -134,6 +156,9 @@
|
||||
case 'toAdd':
|
||||
this.toAdd()
|
||||
break
|
||||
case 'doDel':
|
||||
this.doDel()
|
||||
break
|
||||
case 'doClose':
|
||||
this.doClose()
|
||||
break
|
||||
@@ -188,6 +213,46 @@
|
||||
this.$refs['divadd'].showAdd()
|
||||
},
|
||||
|
||||
doDel() {
|
||||
|
||||
if (this.sids.length > 0) {
|
||||
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
|
||||
this.$confirm(tip, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: 'Loading',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
})
|
||||
req.deleteBySids(this.sids).then((resp) => {
|
||||
loading.close()
|
||||
if (resp.success) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: resp.msg,
|
||||
showClose: true
|
||||
})
|
||||
this.loadList()
|
||||
} else {
|
||||
// 根据resp.code进行异常情况处理
|
||||
}
|
||||
}).catch(e => {
|
||||
loading.close()
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: '请至少选择一条记录进行删除操作'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
doClose() {
|
||||
this.$store.dispatch('tagsView/delView', this.$route)
|
||||
this.$router.go(-1)
|
||||
@@ -197,7 +262,7 @@
|
||||
this.$refs['divadd'].showEdit(row)
|
||||
},
|
||||
toRelevancyInfo(row) {
|
||||
const tip = '请确认是否删除所选品牌?'
|
||||
const tip = '请确认是否删除所选?'
|
||||
this.$confirm(tip, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
</div>
|
||||
<div class="item">
|
||||
<span class="item_text">仓库备注:</span>
|
||||
<el-input v-model="formobj.remarks" placeholder="具体地址" class="item_input" clearable />
|
||||
<el-input v-model="formobj.remarks" placeholder="备注" class="item_input" clearable />
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
@@ -118,6 +118,26 @@
|
||||
},
|
||||
saveOrUpdate() {
|
||||
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
|
||||
|
||||
if (this.formobj.warehouseName == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '仓库名称不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (this.formobj.warehouseCode == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '仓库编码不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
req.saveWarehouse(this.formobj)
|
||||
.then(resp => {
|
||||
if (resp.success) {
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
<!-- End 项目列表头部 -->
|
||||
<!-- Start 项目列表 -->
|
||||
<div class="">
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
|
||||
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
|
||||
@selection-change="selectionLineChangeHandle">
|
||||
<el-table-column fixed width="50" type="selection" align="center" />
|
||||
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
|
||||
<el-table-column label="操作" align="center" width="180">
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
|
||||
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
|
||||
@@ -93,6 +94,13 @@
|
||||
btnKey: 'toAdd',
|
||||
btnLabel: '新增'
|
||||
},
|
||||
{
|
||||
type: 'danger',
|
||||
size: 'small',
|
||||
icon: 'plus',
|
||||
btnKey: 'doDel',
|
||||
btnLabel: '删除'
|
||||
},
|
||||
{
|
||||
type: 'info',
|
||||
size: 'small',
|
||||
@@ -109,7 +117,8 @@
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
sids: []
|
||||
sids: [],
|
||||
selectionList: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -119,6 +128,19 @@
|
||||
this.loadList()
|
||||
},
|
||||
methods: {
|
||||
selectionLineChangeHandle(val) {
|
||||
console.log("val", val);
|
||||
|
||||
this.selectionList = val
|
||||
|
||||
const aa = []
|
||||
val.forEach(element => {
|
||||
aa.push(element.sid)
|
||||
})
|
||||
this.sids = aa
|
||||
|
||||
|
||||
},
|
||||
// 搜索条件效果
|
||||
clicksearchShow() {
|
||||
this.isSearchShow = !this.isSearchShow
|
||||
@@ -133,6 +155,9 @@
|
||||
case 'toAdd':
|
||||
this.toAdd()
|
||||
break
|
||||
case 'doDel':
|
||||
this.doDel()
|
||||
break
|
||||
case 'doClose':
|
||||
this.doClose()
|
||||
break
|
||||
@@ -186,6 +211,44 @@
|
||||
this.viewState = 2
|
||||
this.$refs['divadd'].showAdd()
|
||||
},
|
||||
doDel() {
|
||||
|
||||
if (this.sids.length > 0) {
|
||||
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
|
||||
this.$confirm(tip, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: 'Loading',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
})
|
||||
req.deleteBySids(this.sids).then((resp) => {
|
||||
loading.close()
|
||||
if (resp.success) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: resp.msg,
|
||||
showClose: true
|
||||
})
|
||||
this.loadList()
|
||||
} else {
|
||||
// 根据resp.code进行异常情况处理
|
||||
}
|
||||
}).catch(e => {
|
||||
loading.close()
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: '请至少选择一条记录进行删除操作'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
doClose() {
|
||||
this.$store.dispatch('tagsView/delView', this.$route)
|
||||
|
||||
@@ -109,6 +109,33 @@
|
||||
|
||||
saveOrUpdate() {
|
||||
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
|
||||
|
||||
if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '所属仓库不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (this.formobj.areaName == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '仓区名称不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (this.formobj.areaCode == '') {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
type: 'error',
|
||||
message: '库区编码不能为空'
|
||||
})
|
||||
return
|
||||
}
|
||||
req.saveWarehousearea(this.formobj)
|
||||
.then(resp => {
|
||||
if (resp.success) {
|
||||
@@ -133,6 +160,8 @@
|
||||
volume: '',
|
||||
unit: '',
|
||||
remarks: '',
|
||||
warehouseName: '',
|
||||
warehouseSid: '',
|
||||
areaTypeSid: "",
|
||||
areaTypeName: "",
|
||||
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
<!-- End 项目列表头部 -->
|
||||
<!-- Start 项目列表 -->
|
||||
<div class="">
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
|
||||
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
|
||||
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
|
||||
@selection-change="selectionLineChangeHandle">
|
||||
<el-table-column fixed width="50" type="selection" align="center" />
|
||||
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
|
||||
<el-table-column label="操作" align="center" width="180">
|
||||
<el-table-column label="操作" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
|
||||
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
|
||||
@@ -90,6 +91,13 @@
|
||||
btnKey: 'toAdd',
|
||||
btnLabel: '新增'
|
||||
},
|
||||
{
|
||||
type: 'danger',
|
||||
size: 'small',
|
||||
icon: 'plus',
|
||||
btnKey: 'doDel',
|
||||
btnLabel: '删除'
|
||||
},
|
||||
{
|
||||
type: 'info',
|
||||
size: 'small',
|
||||
@@ -106,7 +114,8 @@
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
sids: []
|
||||
sids: [],
|
||||
selectionList: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -116,6 +125,17 @@
|
||||
this.loadList()
|
||||
},
|
||||
methods: {
|
||||
selectionLineChangeHandle(val) {
|
||||
console.log("val", val);
|
||||
|
||||
this.selectionList = val
|
||||
|
||||
const aa = []
|
||||
val.forEach(element => {
|
||||
aa.push(element.sid)
|
||||
})
|
||||
this.sids = aa
|
||||
},
|
||||
// 搜索条件效果
|
||||
clicksearchShow() {
|
||||
this.isSearchShow = !this.isSearchShow
|
||||
@@ -130,6 +150,9 @@
|
||||
case 'toAdd':
|
||||
this.toAdd()
|
||||
break
|
||||
case 'doDel':
|
||||
this.doDel()
|
||||
break
|
||||
case 'doClose':
|
||||
this.doClose()
|
||||
break
|
||||
@@ -183,6 +206,44 @@
|
||||
this.viewState = 2
|
||||
this.$refs['divadd'].showAdd()
|
||||
},
|
||||
doDel() {
|
||||
|
||||
if (this.sids.length > 0) {
|
||||
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
|
||||
this.$confirm(tip, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: 'Loading',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
})
|
||||
req.deleteBySids(this.sids).then((resp) => {
|
||||
loading.close()
|
||||
if (resp.success) {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: resp.msg,
|
||||
showClose: true
|
||||
})
|
||||
this.loadList()
|
||||
} else {
|
||||
// 根据resp.code进行异常情况处理
|
||||
}
|
||||
}).catch(e => {
|
||||
loading.close()
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: '请至少选择一条记录进行删除操作'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
doClose() {
|
||||
this.$store.dispatch('tagsView/delView', this.$route)
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
initData() {
|
||||
console.log('>>>>>>>>>initData')
|
||||
var parpams = {
|
||||
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
|
||||
orgPath: window.sessionStorage.getItem('orgsid'),
|
||||
}
|
||||
|
||||
req.getAllType(parpams).then(resp => {
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
|
||||
<div class="listconadd">
|
||||
|
||||
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
|
||||
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
|
||||
<div class="title">
|
||||
<div>基础信息</div>
|
||||
</div>
|
||||
<el-row class="first_row">
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品名称</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品名称</div>
|
||||
<el-form-item prop="goodsName">
|
||||
<el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw addinputInfo" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -56,8 +56,8 @@
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品编码</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品编码</div>
|
||||
<el-form-item prop="goodsCode">
|
||||
<el-input v-model="formobj.goodsCode" placeholder="商品编码" class="addinputw addinputInfo" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -81,8 +81,8 @@
|
||||
<el-row>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品品牌</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品品牌</div>
|
||||
<el-form-item prop="brandName">
|
||||
<el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw"
|
||||
@change="selectBrandChange">
|
||||
<el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
|
||||
@@ -91,8 +91,8 @@
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品类别</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品类别</div>
|
||||
<el-form-item prop="typeName">
|
||||
<el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" @change="selectCateChange">
|
||||
<el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
|
||||
</el-select>
|
||||
@@ -101,8 +101,8 @@
|
||||
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品单位</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品单位</div>
|
||||
<el-form-item prop="goodsUnitName">
|
||||
<el-select v-model="formobj.goodsUnitName" placeholder="请选择商品单位" class="addinputw"
|
||||
@change="selectunitNameChange">
|
||||
<el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
|
||||
@@ -115,8 +115,8 @@
|
||||
<el-row>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">商品厂家</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 商品厂家</div>
|
||||
<el-form-item prop="manufacturerName">
|
||||
<el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw"
|
||||
@change="selectfacturerChange">
|
||||
<el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
|
||||
@@ -168,8 +168,8 @@
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">税率</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 税率</div>
|
||||
<el-form-item prop="taxRate">
|
||||
<el-input v-model="formobj.taxRate" placeholder="税率" class="addinputw addinputInfo" clearable
|
||||
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
|
||||
</el-form-item>
|
||||
@@ -181,8 +181,8 @@
|
||||
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="span-sty">保质期天</div>
|
||||
<el-form-item>
|
||||
<div class="span-sty"><span class="must">*</span> 保质期天</div>
|
||||
<el-form-item prop="shelfLife">
|
||||
<el-input v-model="formobj.shelfLife" placeholder="保质期天" class="addinputw addinputInfo" clearable
|
||||
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
|
||||
</el-form-item>
|
||||
@@ -804,7 +804,44 @@
|
||||
dialogVisible2: false,
|
||||
dialogVisible3: false,
|
||||
itemInfo: {},
|
||||
orderInfo: {}
|
||||
orderInfo: {},
|
||||
rules: {
|
||||
goodsName: [{
|
||||
required: true,
|
||||
message: '商品名称不能为空',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
goodsCode: [{
|
||||
required: true,
|
||||
message: '商品编码不能为空',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
goodsUnitName: [{
|
||||
required: true,
|
||||
message: '请选择计量单位',
|
||||
trigger: 'change'
|
||||
}],
|
||||
goodsTypeName: [{
|
||||
required: true,
|
||||
message: '请选择商品类别',
|
||||
trigger: 'change'
|
||||
}],
|
||||
brandName: [{
|
||||
required: true,
|
||||
message: '请选择商品品牌',
|
||||
trigger: 'change'
|
||||
}],
|
||||
manufacturerName: [{
|
||||
required: true,
|
||||
message: '请选择商品厂家',
|
||||
trigger: 'change'
|
||||
}],
|
||||
shelfLife: [{
|
||||
required: true,
|
||||
message: '商品保质期不能为空',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@@ -842,6 +879,8 @@
|
||||
|
||||
saveOrUpdate() {
|
||||
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
|
||||
this.$refs['form_obj'].validate((valid) => {
|
||||
if (valid) {
|
||||
req.saveGoods(this.formobj)
|
||||
.then(resp => {
|
||||
if (resp.success) {
|
||||
@@ -856,6 +895,8 @@
|
||||
}
|
||||
})
|
||||
.catch(() => {})
|
||||
}
|
||||
})
|
||||
},
|
||||
handleReturn(isreload) {
|
||||
if (isreload === 'true') this.$emit('reloadlist')
|
||||
@@ -888,6 +929,9 @@
|
||||
this.$emit('doback')
|
||||
},
|
||||
showAdd() {
|
||||
this.$nextTick(() => {
|
||||
this.$refs['form_obj'].clearValidate()
|
||||
})
|
||||
var sid = require('uuid').v1()
|
||||
console.log('>>>>>>>>>showAdd', sid)
|
||||
|
||||
@@ -897,6 +941,9 @@
|
||||
return index + 1
|
||||
},
|
||||
showEdit(row) {
|
||||
this.$nextTick(() => {
|
||||
this.$refs['form_obj'].clearValidate()
|
||||
})
|
||||
req.initGoods(row.sid)
|
||||
.then(resp => {
|
||||
if (resp.success) {
|
||||
@@ -1019,7 +1066,8 @@
|
||||
|
||||
console.log('>>>>>>>>>saveGoodsSkuDttail', this.itemInfo)
|
||||
|
||||
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.baseGoodsSkuExtend.sid == this.itemInfo.sid)
|
||||
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.baseGoodsSkuExtend.sid == this
|
||||
.itemInfo.sid)
|
||||
|
||||
console.log('>>>>>>>>>saveGoodsSkuDttail', index)
|
||||
|
||||
@@ -1041,6 +1089,14 @@
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
/deep/ .el-form-item__error {
|
||||
margin-left: 120px !important;
|
||||
}
|
||||
|
||||
.must {
|
||||
color: #f00;
|
||||
}
|
||||
|
||||
.span-sty {
|
||||
width: 130px !important;
|
||||
}
|
||||
@@ -1065,4 +1121,10 @@
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.el-radio /deep/ .el-radio__label {
|
||||
|
||||
font-size: 14px !important;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user