Browse Source

2023-5-6

醇油坊
master
guoxing 2 years ago
parent
commit
4cc526d48a
  1. 56
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/flowInstrument/flowInstrument.js
  2. 15
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js
  3. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
  4. 13
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js
  5. 219
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
  6. 227
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
  7. 56
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/outBoundAdd.vue
  8. 29
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilTank/index.vue
  9. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilTank/oilTankAdd.vue
  10. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilType/index.vue

56
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/flowInstrument/flowInstrument.js

@ -0,0 +1,56 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/cyf/flowmeter/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
addInfo: function(data) {
return request({
url: '/cyf/flowmeter/save',
method: 'post',
data: data
});
},
fetchBySid: function(sid) {
return request({
url: '/cyf/flowmeter/getTankBySid/' + sid
})
},
updateData: function(data) {
return request({
url: '/cyf/flowmeter/update',
method: 'post',
data: data
});
},
delBySids: function(sid) {
return request({
url: '/cyf/flowmeter/delete/' + sid,
method: 'delete'
})
},
flowmeterList: function(params) {
return request({
url: '/cyf/flowmeter/flowmeterList',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
}

15
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js

@ -21,7 +21,7 @@ export default {
data: data
});
},
crudeinfoList: function(params) {
return request({
url: '/cyf/crudeinfo/list',
@ -32,7 +32,7 @@ export default {
}
})
},
fetchBySid: function(sid) {
return request({
@ -55,4 +55,13 @@ export default {
})
},
}
// 保存每次读取库存
saveInfo: function(data) {
return request({
url: '/cyf/crudeinventory/save',
method: 'post',
data: data
});
},
}

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue

@ -59,6 +59,16 @@
name: "/oilTank/index",
path: "/oilTank/index"
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-menu",
title: "流量仪器"
},
name: "/flowInstrument/index",
path: "/flowInstrument/index"
},
{
alwaysShow: true,
component: 'index',

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

@ -72,6 +72,19 @@ export const constantRoutes = [
noCache: true
}
}]
},{
path: 'flowInstrument',
component: Layout,
redirect: '/flowInstrument',
children: [{
path: '/flowInstrument/index',
component: () => import('@/views/flowInstrument/index.vue'),
name: 'index',
meta: {
title: '流程仪器',
noCache: true
}
}]
},{
path: 'inAndOutBound',
component: Layout,

219
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue

@ -0,0 +1,219 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<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>
<el-card class="box-card">
<div class="item">
<span class="item_text">流量仪器名称</span>
<el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">流量仪器编码</span>
<el-input v-model="formobj.number" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">流量仪器Code</span>
<el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</div>
</el-card>
</div>
</div>
</template>
<script>
import req from '@/api/flowInstrument/flowInstrument'
import req2 from '@/api/inAndOutBound/inAndOutBound'
export default {
data() {
return {
submitdisabled: false,
tankLists: [],
tankList: [],
formobj: {
sid: "",
name: "",
number: "",
code: "",
tankNumber: "",
tankSid:"",
}
}
},
created() {
this.getTankList()
},
methods: {
getTankList() {
req2.tankList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.tankLists = res.data
for (var i = 0; i < this.tankLists.length; i++) {
let item = {
name: this.tankLists[i].number,
sid: this.tankLists[i].sid,
}
this.tankList.push(item)
}
}
})
},
getTank(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.tankLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.tankSid = choose[0].sid
},
saveOrUpdate() {
if(this.formobj.sid){
req.updateData(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
} else {
// resp.code
}
})
.catch(() => {})
}else{
req.addInfo(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
} else {
// resp.code
}
})
.catch(() => {})
}
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: "",
name: "",
number: "",
code: "",
tankNumber:"",
tankSid:"",
}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
console.log("sid>>>>>>>>>",row.sid)
req.fetchBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = row
})
}
}
}
</script>
<style lang="scss">
.box-card {
margin-left: 60px;
margin-right: 60px;
min-width: 70%;
margin-top: 20px;
.item {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 15px;
height: 40px;
line-height: 40px;
.item_text {
flex: 0.8;
font-size: 18px;
text-align: right;
}
.item_input {
flex: 4;
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
}
.item_left_input {
width: 20%;
}
.item_left_text {
height: 30px;
margin-left: 20px;
line-height: 30px;
color: #018AD2;
padding: 0px 15px;
border: 1.5px solid #018AD2;
border-radius: 5px;
}
.item_right {
flex: 1;
justify-items: center;
.item_right_list_text {
font-size: 16px;
}
.item_right_list_delect {
color: #5E94FF;
margin-left: 20px;
font-size: 16px;
text-decoration: underline;
}
}
}
}
</style>

227
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue

@ -0,0 +1,227 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<button-bar view-title="流量仪器" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<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"
clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleFilter">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">流量仪器列表</div>
<!-- 翻页分页 -->
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
</div>
<div class="">
<el-table v-loading="listLoading" :data="list" border style="width: 100%;">
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" wid align="center" width="180">
<template slot-scope="scope">
<!-- <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button> -->
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="流量仪器名称" prop="name" align="center" />
<el-table-column label="流量仪器编号" prop="number" align="center" />
<el-table-column label="流量仪器Code" prop="code" align="center" />
<el-table-column label="油罐编号" prop="tankNumber" align="center" />
<el-table-column label="原油编号" prop="crudeNumber" align="center" />
</el-table>
</div>
<div class="pages">
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<flowInstrumentAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
</div>
</template>
<script>
import req from '@/api/flowInstrument/flowInstrument'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import flowInstrumentAdd from './flowInstrumentAdd.vue'
// import oilTypeInfo from './oilTypeInfo.vue'
export default {
name: 'CustomerManagement',
components: {
Pagination,
pageye,
ButtonBar,
flowInstrumentAdd,
// oilTypeInfo,
},
data() {
return {
listLoading: false,
btndisabled: false,
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
list: [],
listQuery: {
current: 1,
size: 10,
params: {
entryName: '',
},
total: 0
},
viewState: 1
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
//
},
methods: {
btnHandle(btnKey) {
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
//
init() {
this.getList()
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleReset() {
this.listQuery.current = 1
this.getList()
},
//
handleFilter() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
entryName: ""
}
}
this.getList()
},
//
toAdd() {
this.viewState = 2
},
//
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
// ID
doDel(row) {
const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.delBySids(row.sid).then((response) => {
if (response.success) {
this.$message({
showClose: true,
type: 'success',
message: '删除成功'
})
this.getList()
} else {
this.$message({
showClose: true,
type: 'error',
message: '删除失败'
})
}
})
})
},
// toDetail(row) {
// this.viewState = 4
// this.$refs['divInfo'].showAdd(row.sid)
// },
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

56
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inAndOutBound/outBoundAdd.vue

@ -31,14 +31,20 @@
value-format="yyyy-MM-dd" placeholder="请选择" />
</div>
<div class="item">
<span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
<span class="item_text">流量仪器</span>
<el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
@change="getFlowmeter">
<el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div>
<div class="item">
<span class="item_text">原油种类</span>
<span class="item_text">油罐编号</span>
<el-input v-model="formobj.tankName" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div>
<div class="item">
<span class="item_text">原油编号</span>
<el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div>
@ -63,44 +69,48 @@
<script>
import req from '@/api/inAndOutBound/inAndOutBound'
import req2 from '@/api/flowInstrument/flowInstrument'
export default {
data() {
return {
submitdisabled: false,
tankLists: [],
tankList: [],
flowmeterLists: [],
flowmeterList: [],
formobj: {
sid: "",
salesContractNumber: "",
contractSigningDate: "",
deliveryDate: "",
flowmeterSid: "",
flowmeterName: "",
tankName: "",
tankSid: "",
oilType: "",
weight: "",
value: "",
remarks:"",
remarks: "",
}
}
},
created() {
this.getTankList()
console.log(">>>>>>>>>created")
this.getFlowmeterList()
},
methods: {
getTankList() {
req.tankList().then((res) => {
getFlowmeterList() {
console.log(">>>>>>>>>111111111111wwwwwwwwww")
req2.flowmeterList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.tankLists = res.data
for (var i = 0; i < this.tankLists.length; i++) {
this.flowmeterLists = res.data
for (var i = 0; i < this.flowmeterLists.length; i++) {
let item = {
name: this.tankLists[i].number,
sid: this.tankLists[i].sid,
name: this.flowmeterLists[i].number,
sid: this.flowmeterLists[i].sid,
}
this.tankList.push(item)
this.flowmeterList.push(item)
}
}
@ -130,22 +140,24 @@
salesContractNumber: "",
contractSigningDate: "",
deliveryDate: "",
flowmeterSid: "",
flowmeterName: "",
tankName: "",
tankSid: "",
oilType: "",
weight: "",
value: "",
remarks:"",
remarks: "",
}
this.$emit('doback')
},
getTank(value) {
getFlowmeter(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.tankLists.filter((item) => item.sid === value)
const choose = this.flowmeterLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.tankSid = choose[0].sid
this.formobj.oilType = choose[0].crudeName
this.formobj.flowmeterSid = choose[0].sid
this.formobj.tankName = choose[0].tankNumber
this.formobj.oilType = choose[0].crudeNumber
},
}
}

29
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilTank/index.vue

@ -38,7 +38,6 @@
<el-table-column label="原油名称" prop="crudeName" align="center" />
<el-table-column label="原油编号" prop="crudeNumber" align="center" />
<el-table-column label="油罐容量" prop="capacity" align="center" />
<el-table-column label="油罐管道" prop="tankPipeline" align="center" />
<el-table-column label="油罐库存" prop="inventory" align="center" />
<el-table-column label="油罐现有库存" prop="existingInventory" align="center" />
</el-table>
@ -52,13 +51,13 @@
</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>
<!-- <span>{{form.planContent}}</span> -->
<el-input v-model="form.planOpinion" style="width: 300px"></el-input>
<el-input v-model="form.existingInventory" style="width: 300px"></el-input>
</td>
</tr>
</table>
@ -91,8 +90,8 @@
return {
listLoading: false,
btndisabled: false,
editDialog: false,
form:{},
editDialog: false,
form: {},
btnList: [{
type: 'primary',
size: 'small',
@ -231,12 +230,28 @@
},
toDetail(row) {
this.editDialog = true;
this.form.tankSid = row.sid
},
save() {
console.log("form", this.form)
this.reset();
req.saveInfo(this.form)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.editDialog = false;
this.getList()
} else {
// resp.code
}
})
.catch(() => {})
this.reset();
},
reset() {
this.form = {};

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilTank/oilTankAdd.vue

@ -37,13 +37,9 @@
<span class="item_text">油罐容量</span>
<el-input v-model="formobj.capacity" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐管道</span>
<el-input v-model="formobj.tankPipeline" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐库存</span>
<el-input v-model="formobj.inventory" placeholder="" class="item_input" clearable />
<el-input v-model="formobj.initialInventory" placeholder="" class="item_input" clearable />
</div>
</el-card>
@ -68,7 +64,7 @@
crudeNumber: "",
capacity: "",
tankPipeline: "",
inventory: "",
initialInventory: "",
}
}
@ -122,7 +118,7 @@
crudeNumber: "",
capacity: "",
tankPipeline: "",
inventory: "",
initialInventory: "",
}
this.$emit('doback')

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/oilType/index.vue

@ -19,7 +19,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">项目列表</div>
<div class="tit">原油列表</div>
<!-- 翻页分页 -->
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
</div>

Loading…
Cancel
Save