Browse Source

5.30

master
fengdong777 2 years ago
parent
commit
086a3b4344
  1. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  2. 38
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js
  3. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
  4. 123
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue
  5. 77
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue
  6. 6
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue
  7. 18
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue
  8. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue
  9. 9
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue
  10. 182
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/becomeOil/index.vue

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development

@ -6,7 +6,7 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
## VUE_APP_URL = "http://cg9jzr.natappfree.cc"
VUE_APP_URL = "http://192.168.1.193:7101"
VUE_APP_URL = "http://192.168.1.177:7101"
## VUE_APP_URL = "http://192.168.1.193:7101"

38
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js

@ -57,4 +57,42 @@ export default {
}
})
},
//添加成品油库存
invenRecordSave: function(params) {
return request({
url: '/cyf/invenRecord/save',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
//修改商品类别单价
inventoryUpdate: function(params) {
return request({
url: '/cyf/inventory/update',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 查询品牌下商品的
selectInformationType: function(sid) {
return request({
url: '/cyf/productInfo/selectInformationType/' + sid,
method: 'get'
})
},
// 查询商品下各个类别的
selectProductType: function(sid) {
return request({
url: '/cyf/productType/selectProductType/' + sid,
method: 'get'
})
},
}

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js

@ -146,7 +146,7 @@ export const constantRoutes = [{
import('@/views/baseInfo/becomeoil/index.vue'),
name: 'index',
meta: {
title: '商品类别'
title: '商品油库存'
}
},
]

123
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/commodity.vue

@ -14,23 +14,46 @@
<div class="listconadd">
<el-card class="box-card">
<div class="item">
<span class="item_text">品牌名称:</span>
<el-select v-model="formobj.prodSid" filterable placeholder="请选择品牌名称" class="item_input" @change="getType" >
<el-option v-for="(item,i) in prodList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">品牌编码:</span>
<el-input v-model="formobj.prodNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">商品名称:</span>
<el-select v-model="formobj.prodSid" placeholder="" class="item_input" >
<el-option v-for="(item,i) in sidlist" :key="i" :label="item.name" :value="item.sid" />
<el-select v-model="formobj.crudeSid" filterable placeholder="请选择商品名称" class="item_input" @change="getTank" >
<el-option v-for="(item,i) in crudeList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">数量:</span>
<el-input v-model="formobj.amount" placeholder="请输入数量" class="item_input" clearable />
<span class="item_text">商品编码:</span>
<el-input v-model="formobj.crudeNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">编号:</span>
<el-input v-model="formobj.number" placeholder="请输入编码" class="item_input" clearable />
<span class="item_text">商品类别:</span>
<el-select v-model="formobj.ListSid" filterable placeholder="请选择类别名称" class="item_input" @change="getList" >
<el-option v-for="(item,i) in ListList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">类别编码:</span>
<el-input v-model="formobj.ListNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">数量:</span>
<el-input v-model="form.amount" placeholder="请输入数量" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">单价():</span>
<el-input v-model="formobj.price" placeholder="请输入单价" class="item_input" clearable />
<el-input v-model="form.price" placeholder="请输入单价" class="item_input" clearable />
</div>
</el-card>
@ -45,15 +68,27 @@
data() {
return {
submitdisabled: false,
prodLists: [],
prodList: [],
crudeLists: [],
crudeList: [],
sidlist:[],
ListLists: [],
ListList: [],
formobj: {
amount: "",
number: "",
price:'',
prodSid:'',
prodNumber:'',
crudeNumber:'',
crudeSid:'',
ListNumber:'',
ListSid:'',
},
form:{
amount:'',
price:'',
prodSid:'',
}
}
},
created() {
@ -61,7 +96,7 @@
},
methods: {
saveOrUpdate() {
req.save(this.formobj)
req.save(this.form)
.then(resp => {
if (resp.success) {
this.$message({
@ -79,12 +114,49 @@
},
last(){
req.selectList().then((response) => {
this.listLoading = false
if (response.success) {
this.sidlist = response.data
} else {
this.sidlist = []
this.prodLists = response.data
for (var i = 0; i < this.prodLists.length; i++) {
let item = {
name: this.prodLists[i].name,
sid: this.prodLists[i].sid,
}
this.prodList.push(item)
}}
})
},
lastList(value){
req.selectInformationType(value).then((response) => {
if (response.success) {
this.crudeLists = response.data
this.crudeList = []
this.ListList = []
for (var i = 0; i < this.crudeLists.length; i++) {
let item = {
name: this.crudeLists[i].name,
sid: this.crudeLists[i].sid,
}
this.crudeList.push(item)
}}
})
},
handleList(value){
req.selectProductType(value).then((response) => {
if (response.success) {
this.ListLists = response.data
this.ListList = []
for (var i = 0; i < this.ListLists.length; i++) {
let item = {
name: this.ListLists[i].name,
sid: this.ListLists[i].sid,
}
this.ListList.push(item)
}}
})
},
handleReturn(isreload) {
@ -95,6 +167,29 @@
}
this.$emit('doback')
},
getType(value) {
const choose = this.prodLists.filter((item) => item.sid === value)
this.formobj.prodNumber = choose[0].number
this.formobj.crudeSid=''
this.formobj.crudeNumber=''
this.formobj.ListSid=''
this.formobj.ListNumber=''
this.lastList(value)
},
getTank(value) {
const choose = this.crudeLists.filter((item) => item.sid === value)
this.formobj.crudeNumber = choose[0].number
this.formobj.ListSid=''
this.formobj.ListNumber=''
this.handleList(value)
},
getList(value) {
const choose = this.ListLists.filter((item) => item.sid === value)
this.formobj.ListNumber = choose[0].number
this.form.prodSid = value
},
}
}
</script>

77
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue

@ -2,7 +2,7 @@
<div class="app-container">
<div v-show="viewState == 1">
<button-bar
view-title="成品油类型"
view-title="成品油库存"
ref="btnbar"
:btndisabled="btndisabled"
@btnhandle="btnHandle"
@ -20,11 +20,11 @@
label-width="80px"
class="tab-header"
>
<el-form-item label="成品油名称">
<el-form-item label="品牌编号">
<el-input
v-model="listQuery.params.name"
maxlength="20"
placeholder="请输入成品油名称"
placeholder="请输入品牌编号"
class="addinputw"
clearable
/>
@ -66,22 +66,25 @@
:index="indexMethod"
align="center"
/>
<!-- <el-table-column label="操作" align="center" width="150px">
<el-table-column label="品牌名称" prop="informationName" align="center" />
<el-table-column label="品牌编号" prop="informationNumber" align="center" />
<el-table-column label="商品名称" prop="prodName" align="center" />
<el-table-column label="商品编码" prop="prodNumber" align="center" />
<el-table-column label="商品类别" prop="typeName" align="center" />
<el-table-column label="类别编码" prop="typeNumber" align="center" />
<el-table-column label="数量" prop="amount" align="center" />
<el-table-column label="单价" prop="price" align="center" />
<el-table-column label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
编辑
修改单价
</el-button>
</template>
</el-table-column> -->
<el-table-column label="品牌名称" prop="name" align="center" />
<el-table-column label="品牌编号" prop="informationNumber" align="center" />
<el-table-column label="数量" prop="amount" align="center" />
<el-table-column label="单价" prop="price" align="center" />
<el-table-column label="成品油编号" prop="number" align="center" />
</el-table-column>
</el-table>
</div>
<div class="pages">
@ -96,25 +99,18 @@
</div>
</div>
</div>
<oilTankAdd
v-show="viewState == 2 || viewState == 3"
ref="divAdd"
@doback="resetState"
@reloadlist="getList"
/>
<!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
<el-dialog title="修改产品类型" :visible.sync="editDialog" width="40%">
<el-dialog title="修改类别单价" :visible.sync="editDialog" width="40%">
<table class="e-table" cellspacing="0">
<tr>
<td>类型名称</td>
<td>商品类别名称</td>
<td>
<el-input v-model="form.name" style="width: 300px"></el-input>
<el-input v-model="form.typeName" readonly style="width: 300px"></el-input>
</td>
</tr>
<tr>
<td>类型编号</td>
<td>单价</td>
<td>
<el-input v-model="form.number" style="width: 300px"></el-input>
<el-input v-model="form.price" style="width: 300px"></el-input>
</td>
</tr>
</table>
@ -122,6 +118,12 @@
<el-button type="primary" @click="save()">保存</el-button>
</div>
</el-dialog>
<oilTankAdd
v-show="viewState == 2 || viewState == 3"
ref="divAdd"
@doback="resetState"
@reloadlist="getList"
/>
</div>
</template>
@ -147,9 +149,9 @@ export default {
btndisabled: false,
editDialog: false,
form: {
name: "",
number: "",
price: "",
sid: "",
typeName:'',
},
btnList: [
{
@ -253,34 +255,33 @@ export default {
};
this.getList();
},
//
toAdd() {
this.viewState = 2;
},
purchase(row) {
this.editDialog = true;
this.form = Object.assign({}, row);
this.form.sid = row.sid;
this.form.sid = row.sid
},
save() {
req
.update(this.form)
.then((resp) => {
req.inventoryUpdate(this.form)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: "success",
message: resp.msg,
});
type: 'success',
message: resp.msg
})
this.editDialog = false;
this.getList();
this.getList()
} else {
// resp.code
}
})
.catch(() => {});
.catch(() => {})
this.reset();
},
//
toAdd() {
this.viewState = 2;
},
reset() {
this.form = {};
},

6
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue

@ -7,8 +7,8 @@
<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="80px" class="tab-header">
<el-form-item label="品牌名称">
<el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入类型名称" class="addinputw"
<el-form-item label="品牌编号">
<el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入品牌编号" class="addinputw"
clearable />
</el-form-item>
</el-form>
@ -40,8 +40,6 @@
</el-table-column>
<el-table-column label="品牌名称" prop="name" align="center" />
<el-table-column label="品牌编号" prop="number" align="center" />
<el-table-column label="品牌初始库存" prop="inventoryQuantity" align="center" />
<el-table-column label="品牌现有库存" prop="amount" align="center" />
</el-table>
</div>
<div class="pages">

18
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>添加商品类别</div>
<div>添加商品</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@ -14,20 +14,20 @@
<div class="listconadd">
<el-card class="box-card" >
<div class="item">
<span class="item_text">类别名称</span>
<el-input v-model="form.name" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">类别名称编号</span>
<el-input v-model="form.number" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">品牌名称</span>
<el-select v-model="form.prodSid" placeholder="" class="item_input" >
<el-option v-for="(item,i) in sidlist" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">商品名称</span>
<el-input v-model="form.name" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">商品编码</span>
<el-input v-model="form.number" placeholder="" class="item_input" clearable />
</div>
<div class="item" >
<span style="font-size: 18px;margin-left: 90px;padding-right: 10px;">添加类别</span>

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue

@ -47,8 +47,8 @@
</el-table-column>
<el-table-column label="品牌名称" prop="informationName" align="center" />
<el-table-column label="品牌编码" prop="informationNumber" align="center" />
<el-table-column label="类别名称" prop="name" align="center" />
<el-table-column label="类别名称编号" prop="number" align="center" />
<el-table-column label="商品名称" prop="name" align="center" />
<el-table-column label="商品编码" prop="number" align="center" />
<el-table-column label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-button
@ -109,7 +109,7 @@
</td>
</tr>
<tr>
<td>类别名称</td>
<td>商品名称</td>
<td>
<el-input
v-model="shopsName"
@ -159,7 +159,7 @@
</td>
</tr>
<tr>
<td>名称编号</td>
<td>商品编码</td>
<td>
<el-input
v-model="modifythe.number"
@ -176,7 +176,7 @@
<el-dialog title="修改类别" :visible.sync="categorys" width="40%">
<table class="e-table" cellspacing="0">
<tr>
<td>类别名称</td>
<td>商品类别</td>
<td>
<el-input v-model="modifyArray.name" style="width: 300px" placeholder="" />
</td>

9
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue

@ -19,7 +19,7 @@
:inline="true"
class="tab-header"
>
<el-form-item label="油罐编号">
<el-form-item label="类别编号">
<el-input
v-model="jmdListQuery.number"
maxlength="20"
@ -72,14 +72,9 @@
:index="indexMethod"
align="center"
/>
<el-table-column
prop="name"
label="品牌名称"
align="center"
/>
<el-table-column
prop="number"
label="品牌编码"
label="商品类别编号"
align="center"
/>
<el-table-column

182
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/becomeOil/index.vue

@ -3,53 +3,85 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>成品库存登记</div>
<div>成品库存登记</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-card class="box-card">
<div class="item">
<span class="item_text">库存记录</span>
<el-input v-model="formobj.inventoryQuantity" placeholder="" class="item_input"/>
<span class="item_text">品牌名称:</span>
<el-select v-model="formobj.prodSid" filterable placeholder="请选择品牌名称" class="item_input" @change="getType" >
<el-option v-for="(item,i) in prodList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">品牌编码:</span>
<el-input v-model="formobj.prodNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">商品名称:</span>
<el-select v-model="formobj.crudeSid" filterable placeholder="请选择商品名称" class="item_input" @change="getTank" >
<el-option v-for="(item,i) in crudeList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">商品名称</span>
<el-select v-model="formobj.prodSid" filterable placeholder="请选择商品名称" class="item_input">
<el-option v-for="item in packagList" :key="item.sid" :label="item.name" :value="item.sid" />
<span class="item_text">商品编码:</span>
<el-input v-model="formobj.crudeNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">商品类别:</span>
<el-select v-model="formobj.ListSid" filterable placeholder="请选择类别名称" class="item_input" @change="getList" >
<el-option v-for="(item,i) in ListList" :key="i" :label="item.name" :value="item.sid" />
</el-select>
</div>
<div class="item">
<span class="item_text">类别编码:</span>
<el-input v-model="formobj.ListNumber" :readonly="true" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">数量:</span>
<el-input v-model="form.inventoryQuantity" placeholder="请输入数量" class="item_input" clearable />
</div>
</el-card>
</div>
</div>
</template>
</template>
<script>
import req from '@/api/supervise/becomeOil/index.js'
import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao'
<script>
import req from '@/api/baseInfo/becomeoil/index.js'
export default {
components: {
upload
},
data() {
return {
submitdisabled: false,
typeLists: [],
typeList: [],
packagList: [],
imgList: [],
prodLists: [],
prodList: [],
crudeLists: [],
crudeList: [],
ListLists: [],
ListList: [],
formobj: {
inventoryQuantity: "",
prodSid: ""
inventoryQuantity:'',
prodSid:'',
prodNumber:'',
crudeNumber:'',
crudeSid:'',
ListNumber:'',
ListSid:'',
},
form:{
inventoryQuantity:'',
prodSid:'',
}
}
},
@ -57,17 +89,8 @@
this.last()
},
methods: {
last(){
req.selectList().then((response) => {
if (response.success) {
this.packagList = response.data
} else {
this.packagList = []
}
})
},
saveOrUpdate() {
req.save(this.formobj)
req.invenRecordSave(this.form)
.then(resp => {
if (resp.success) {
this.$message({
@ -75,12 +98,11 @@
type: 'success',
message: resp.msg
})
this.formobj = {
inventoryQuantity: "",
prodSid: ""
this.handleReturn("true")
this. form={
inventoryQuantity:'',
prodSid:'',
}
this.imgList = []
} else {
// resp.code
}
@ -88,20 +110,93 @@
.catch(() => {})
},
handleReturn() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
last(){
req.selectList().then((response) => {
if (response.success) {
this.prodLists = response.data
for (var i = 0; i < this.prodLists.length; i++) {
let item = {
name: this.prodLists[i].name,
sid: this.prodLists[i].sid,
}
this.prodList.push(item)
}}
})
},
lastList(value){
req.selectInformationType(value).then((response) => {
if (response.success) {
this.crudeLists = response.data
this.crudeList = []
this.ListList = []
for (var i = 0; i < this.crudeLists.length; i++) {
let item = {
name: this.crudeLists[i].name,
sid: this.crudeLists[i].sid,
}
this.crudeList.push(item)
}}
})
},
handleList(value){
req.selectProductType(value).then((response) => {
if (response.success) {
this.ListLists = response.data
this.ListList = []
for (var i = 0; i < this.ListLists.length; i++) {
let item = {
name: this.ListLists[i].name,
sid: this.ListLists[i].sid,
}
this.ListList.push(item)
}}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
name: "",
number: "",
}
this.$emit('doback')
},
getType(value) {
const choose = this.prodLists.filter((item) => item.sid === value)
this.formobj.prodNumber = choose[0].number
this.formobj.crudeSid=''
this.formobj.crudeNumber=''
this.formobj.ListSid=''
this.formobj.ListNumber=''
this.lastList(value)
},
getTank(value) {
const choose = this.crudeLists.filter((item) => item.sid === value)
this.formobj.crudeNumber = choose[0].number
this.formobj.ListSid=''
this.formobj.ListNumber=''
this.handleList(value)
},
getList(value) {
const choose = this.ListLists.filter((item) => item.sid === value)
this.formobj.ListNumber = choose[0].number
this.form.prodSid = value
},
}
}
</script>
<style lang="scss">
</script>
<style lang="scss">
.box-card {
margin-left: 60px;
margin-right: 60px;
min-width: 70%;
margin-top: 20px;
padding-bottom: 50px;
.item {
display: flex;
@ -158,5 +253,4 @@
}
}
</style>
</style>

Loading…
Cancel
Save