Browse Source

5.18

master
fengdong777 2 years ago
parent
commit
1baf69a276
  1. 5
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  2. 7
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTank/oilTank.js
  3. 15
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeInAndOutBound/oilTypeInAndOutBound.js
  4. 684
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue
  5. 54
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue
  6. 87
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankList/index.vue
  7. 98
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue
  8. 88
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeOutBoundList/index.vue

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

@ -5,5 +5,8 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
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"
##VUE_APP_URL = "http://8.130.39.13:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"

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

@ -35,6 +35,13 @@ export default {
}) })
}, },
selectRecordBySid: function(sid) {
return request({
url: '/cyf/crudeinventory/selectRecordBySid/' + sid,
method: 'get'
})
},
fetchBySid: function(sid) { fetchBySid: function(sid) {
return request({ return request({

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

@ -13,13 +13,26 @@ export default {
} }
}) })
}, },
// 获取油罐by Sid // 获取油罐by Sid
tankLisBySid: function(sid) { tankLisBySid: function(sid) {
return request({ return request({
url: '/cyf/tankinfo/listByType/' + sid url: '/cyf/tankinfo/listByType/' + sid
}) })
}, },
// 获取入库信息 Sid
selectStorageBySid: function(sid) {
return request({
url: 'cyf/crudestorage/selectStorageBySid/' + sid,
method: 'get',
})
},
// 获取出库信息 Sid
getCrudeBySid: function(sid) {
return request({
url: 'cyf/crudeoutbound/getCrudeBySid/' + sid,
method: 'get',
})
},
// 入库 // 入库

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

@ -1,369 +1,371 @@
<template> <template>
<div :class="{'has-logo':showLogo}"> <div :class="{ 'has-logo': showLogo }">
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText" <el-menu
:unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false" :default-active="$route.path"
mode="vertical"> :background-color="variables.menuBg"
<sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" /> :text-color="variables.menuText"
:unique-opened="false"
:active-text-color="variables.menuActiveText"
:collapse-transition="false"
mode="vertical"
>
<sidebar-item
v-for="route in routes"
:key="route.path"
:item="route"
:base-path="route.path"
/>
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
</div> </div>
</template> </template>
<script> <script>
import { import { mapGetters } from "vuex";
mapGetters import Logo from "./Logo";
} from 'vuex' import SidebarItem from "./SidebarItem";
import Logo from './Logo' import variables from "@/styles/variables.scss";
import SidebarItem from './SidebarItem' import { getrolemenus, loginDetails } from "@/api/system/Role/role.js";
import variables from '@/styles/variables.scss' import { getStorage } from "@/utils/auth";
import { export default {
getrolemenus, components: {
loginDetails SidebarItem,
} from '@/api/system/Role/role.js' Logo,
import { },
getStorage data() {
} from '@/utils/auth' return {
export default { YongHuid: [],
components: { // routes: [],
SidebarItem, params: {
Logo sourceSid: "9d048c07-7677-4774-9177-aa02b049ff06",
}, userSid: "",
data() { },
return { routes: [
YongHuid: [], {
// routes: [], alwaysShow: true,
params: { component: "supervise",
sourceSid: '9d048c07-7677-4774-9177-aa02b049ff06', meta: {
userSid: '', icon: "el-icon-menu",
}, title: "库房登记",
routes: [ },
{ name: "",
alwaysShow: true, path: "/supervise",
component: 'supervise', children: [
meta: { {
icon: "el-icon-menu", alwaysShow: true,
title: "库房登记" component: "index",
}, meta: {
name: "", icon: "el-icon-help",
path: "/supervise", title: "油罐库存登记",
children: [{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "油罐库存登记"
},
name: "/supervise/recordOilTank",
path: "/supervise/recordOilTank",
}, },
{ name: "/supervise/recordOilTank",
alwaysShow: true, path: "/supervise/recordOilTank",
component: 'index', },
meta: { {
icon: "el-icon-help", alwaysShow: true,
title: "原油入库登记" component: "index",
}, meta: {
name: "/supervise/oilTypeInBound", icon: "el-icon-help",
path: "/supervise/oilTypeInBound", title: "原油入库登记",
}, },
{ name: "/supervise/oilTypeInBound",
alwaysShow: true, path: "/supervise/oilTypeInBound",
component: 'index', },
meta: { {
icon: "el-icon-help", alwaysShow: true,
title: "原油出库登记" component: "index",
}, meta: {
name: "/supervise/oilTypeOutBound", icon: "el-icon-help",
path: "/supervise/oilTypeOutBound", title: "原油出库登记",
}, },
] name: "/supervise/oilTypeOutBound",
path: "/supervise/oilTypeOutBound",
},
],
},
{
alwaysShow: true,
component: "inventory",
meta: {
icon: "el-icon-menu",
title: "库存管理",
}, },
{ name: "",
alwaysShow: true, path: "/inventory",
component: 'inventory', children: [
meta: { {
icon: "el-icon-menu", alwaysShow: true,
title: "库存管理" component: "index",
meta: {
icon: "el-icon-help",
title: "油罐库存记录",
},
name: "/inventory/oilTankList",
path: "/inventory/oilTankList",
}, },
name: "", {
path: "/inventory", alwaysShow: true,
children: [ component: "index",
{ meta: {
alwaysShow: true, icon: "el-icon-help",
component: 'index', title: "原油入库记录",
meta: {
icon: "el-icon-help",
title: "油罐库存记录"
},
name: "/inventory/oilTankList",
path: "/inventory/oilTankList",
},{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "原油入库记录"
},
name: "/inventory/oilTypeInBoundList",
path: "/inventory/oilTypeInBoundList",
}, },
{ name: "/inventory/oilTypeInBoundList",
alwaysShow: true, path: "/inventory/oilTypeInBoundList",
component: 'index', },
meta: { {
icon: "el-icon-help", alwaysShow: true,
title: "原油出库记录" component: "index",
}, meta: {
name: "/inventory/oilTypeOutBoundList", icon: "el-icon-help",
path: "/inventory/oilTypeOutBoundList", title: "原油出库记录",
}, },
] name: "/inventory/oilTypeOutBoundList",
path: "/inventory/oilTypeOutBoundList",
},
],
},
{
alwaysShow: true,
component: "baseInfo",
meta: {
icon: "el-icon-menu",
title: "基础信息",
}, },
{ name: "",
path: "/baseInfo",
children: [
{
alwaysShow: true, alwaysShow: true,
component: 'baseInfo', component: "index",
meta: { meta: {
icon: "el-icon-menu", icon: "el-icon-help",
title: "基础信息" title: "物料类型",
}, },
name: "", name: "/baseInfo/materialType",
path: "/baseInfo", path: "/baseInfo/materialType",
children: [{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "物料类型"
},
name: "/baseInfo/materialType",
path: "/baseInfo/materialType",
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "物料信息"
},
name: "/baseInfo/materialInfo",
path: "/baseInfo/materialInfo",
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "原油类型"
},
name: "/baseInfo/oilType",
path: "/baseInfo/oilType",
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "油罐信息"
},
name: "/baseInfo/oilTank",
path: "/baseInfo/oilTank",
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "流量仪器"
},
name: "/baseInfo/flowInstrument",
path: "/baseInfo/flowInstrument",
},
{
alwaysShow: true,
component: 'index',
meta: {
icon: "el-icon-help",
title: "供应商信息"
},
name: "/baseInfo/supplier",
path: "/baseInfo/supplier",
}
]
}, },
// { {
// alwaysShow: true, alwaysShow: true,
// component: 'index', component: "index",
// meta: { meta: {
// icon: "el-icon-menu", icon: "el-icon-help",
// title: "" title: "物料信息",
// }, },
// name: "/rawMaterialType/index", name: "/baseInfo/materialInfo",
// path: "/rawMaterialType/index" path: "/baseInfo/materialInfo",
// }, { },
// alwaysShow: true, {
// component: 'index', alwaysShow: true,
// meta: { component: "index",
// icon: "el-icon-menu", meta: {
// title: "" icon: "el-icon-help",
// }, title: "原油类型",
// name: "/rawMaterialInfo/index", },
// path: "/rawMaterialInfo/index" name: "/baseInfo/oilType",
// }, { path: "/baseInfo/oilType",
// alwaysShow: true, },
// component: 'index', {
// meta: { alwaysShow: true,
// icon: "el-icon-menu", component: "index",
// title: "" meta: {
// }, icon: "el-icon-help",
// name: "/oilType/index", title: "油罐信息",
// path: "/oilType/index" },
// }, name: "/baseInfo/oilTank",
// { path: "/baseInfo/oilTank",
// alwaysShow: true, },
// component: 'index', {
// meta: { alwaysShow: true,
// icon: "el-icon-menu", component: "index",
// title: "" meta: {
// }, icon: "el-icon-help",
// name: "/oilTank/index", title: "流量仪器",
// path: "/oilTank/index" },
// }, name: "/baseInfo/flowInstrument",
// { path: "/baseInfo/flowInstrument",
// alwaysShow: true, },
// component: 'index', {
// meta: { alwaysShow: true,
// icon: "el-icon-menu", component: "index",
// title: "" meta: {
// }, icon: "el-icon-help",
// name: "/flowInstrument/index", title: "供应商信息",
// path: "/flowInstrument/index" },
// }, name: "/baseInfo/supplier",
// { path: "/baseInfo/supplier",
// alwaysShow: true, },
// component: 'index', ],
// meta: { },
// icon: "el-icon-menu", // {
// title: "" // alwaysShow: true,
// }, // component: 'index',
// name: "/oilTypeInAndOutBound/index", // meta: {
// path: "/oilTypeInAndOutBound/index" // icon: "el-icon-menu",
// }, // title: ""
// { // },
// alwaysShow: true, // name: "/rawMaterialType/index",
// component: 'index', // path: "/rawMaterialType/index"
// meta: { // }, {
// icon: "el-icon-menu", // alwaysShow: true,
// title: "" // component: 'index',
// }, // meta: {
// name: "/rawMaterialInAndOutBound/index", // icon: "el-icon-menu",
// path: "/rawMaterialInAndOutBound/index" // title: ""
// }, // },
// name: "/rawMaterialInfo/index",
// path: "/rawMaterialInfo/index"
// }, {
// alwaysShow: true,
// component: 'index',
// meta: {
// icon: "el-icon-menu",
// title: ""
// },
// name: "/oilType/index",
// path: "/oilType/index"
// },
// {
// alwaysShow: true,
// component: 'index',
// meta: {
// icon: "el-icon-menu",
// title: ""
// },
// 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',
// meta: {
// icon: "el-icon-menu",
// title: ""
// },
// name: "/oilTypeInAndOutBound/index",
// path: "/oilTypeInAndOutBound/index"
// },
// {
// alwaysShow: true,
// component: 'index',
// meta: {
// icon: "el-icon-menu",
// title: ""
// },
// name: "/rawMaterialInAndOutBound/index",
// path: "/rawMaterialInAndOutBound/index"
// },
// { // {
// alwaysShow: true, // alwaysShow: true,
// component: 'index', // component: 'index',
// meta: { // meta: {
// icon: "el-icon-menu", // icon: "el-icon-menu",
// title: "" // title: ""
// }, // },
// name: "/project/index", // name: "/project/index",
// path: "/project/index" // path: "/project/index"
// }, // },
] ],
} };
},
computed: {
...mapGetters(["sidebar"]),
// routes() {
// f4d2e507-c4ed-451c-b364-04c08f962045
// console.log('78979789', this.$router.options.routes)
// return this.$router.options.routes
// },
activeMenu() {
// const route = this.$route
// const {
// meta,
// path
// } = route
// // if set path, the sidebar will highlight the path you set
// if (meta.activeMenu) {
// return meta.activeMenu
// }
return "/index";
}, },
computed: { showLogo() {
...mapGetters([ return this.$store.state.settings.sidebarLogo;
'sidebar'
]),
// routes() {
// f4d2e507-c4ed-451c-b364-04c08f962045
// console.log('78979789', this.$router.options.routes)
// return this.$router.options.routes
// },
activeMenu() {
// const route = this.$route
// const {
// meta,
// path
// } = route
// // if set path, the sidebar will highlight the path you set
// if (meta.activeMenu) {
// return meta.activeMenu
// }
return "/index"
},
showLogo() {
return this.$store.state.settings.sidebarLogo
},
variables() {
return variables
},
isCollapse() {
return !this.sidebar.opened
}
}, },
created() { variables() {
this.postHuoquyonghu() return variables;
}, },
methods: { isCollapse() {
// return !this.sidebar.opened;
postHuoquyonghu() { },
// var token = getStorage() },
// loginDetails(token).then((response) => { created() {
// console.log('resss', response) this.postHuoquyonghu();
// if (response.code === '200') { },
// this.YongHuid = response.data methods: {
// this.params.userSid = this.YongHuid.sid //
// getrolemenus(this.params).then((res) => { postHuoquyonghu() {
// const userRoles = this.resRouter(res.data) // var token = getStorage()
this.routes.push({ // loginDetails(token).then((response) => {
path: '*', // console.log('resss', response)
redirect: '/404', // if (response.code === '200') {
hidden: true // this.YongHuid = response.data
}) // this.params.userSid = this.YongHuid.sid
console.log('左侧菜单', this.routes) // getrolemenus(this.params).then((res) => {
return this.routes // const userRoles = this.resRouter(res.data)
// }) this.routes.push({
// } path: "*",
// }) redirect: "/404",
}, hidden: true,
resRouter(menus) { });
// console.log("左侧菜单", this.routes);
for (var i = 0; i < menus.length; i++) { return this.routes;
if (menus[i].children && menus[i].children.length != 0) { // })
this.resRouter(menus[i].children) // }
} // })
if (menus[i].children.length == 0) { },
delete menus[i].children resRouter(menus) {
delete menus[i].redirect //
} for (var i = 0; i < menus.length; i++) {
if (menus[i].component == '') { if (menus[i].children && menus[i].children.length != 0) {
console.log('55555', menus[i]) this.resRouter(menus[i].children);
menus[i] = {
path: menus[i].path,
component: '',
redirect: menus[i].path,
children: [menus[i]],
}
} else {
// menus[i] = {
// path: menus[i].path,
// component: '',
// redirect: menus[i].path,
// children: [menus[i]],
// }
}
} }
this.routes = menus if (menus[i].children.length == 0) {
console.log('左侧菜单', this.routes) delete menus[i].children;
return menus delete menus[i].redirect;
}, }
if (menus[i].component == "") {
console.log("55555", menus[i]);
menus[i] = {
path: menus[i].path,
component: "",
redirect: menus[i].path,
children: [menus[i]],
};
} else {
// menus[i] = {
// path: menus[i].path,
// component: '',
// redirect: menus[i].path,
// children: [menus[i]],
// }
}
}
this.routes = menus;
console.log("左侧菜单", this.routes);
return menus;
}, },
} },
};
</script> </script>

54
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/404.vue

@ -2,18 +2,43 @@
<div class="wscn-http404-container"> <div class="wscn-http404-container">
<div class="wscn-http404"> <div class="wscn-http404">
<div class="pic-404"> <div class="pic-404">
<img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404"> <img
<img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404"> class="pic-404__parent"
<img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404"> src="@/assets/404_images/404.png"
<img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404"> alt="404"
/>
<img
class="pic-404__child left"
src="@/assets/404_images/404_cloud.png"
alt="404"
/>
<img
class="pic-404__child mid"
src="@/assets/404_images/404_cloud.png"
alt="404"
/>
<img
class="pic-404__child right"
src="@/assets/404_images/404_cloud.png"
alt="404"
/>
</div> </div>
<div class="bullshit"> <div class="bullshit">
<div class="bullshit__oops">OOPS!</div> <div class="bullshit__oops">OOPS!</div>
<div class="bullshit__info">All rights reserved <div class="bullshit__info">
<a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a> All rights reserved
<a
style="color: #20a0ff"
href="https://wallstreetcn.com"
target="_blank"
>wallstreetcn</a
>
</div> </div>
<div class="bullshit__headline">{{ message }}</div> <div class="bullshit__headline">{{ message }}</div>
<div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div> <div class="bullshit__info">
Please check that the URL you entered is correct, or click the button
below to return to the homepage.
</div>
<a href="" class="bullshit__return-home">Back to home</a> <a href="" class="bullshit__return-home">Back to home</a>
</div> </div>
</div> </div>
@ -21,20 +46,19 @@
</template> </template>
<script> <script>
export default { export default {
name: 'Page404', name: "Page404",
computed: { computed: {
message() { message() {
return 'The webmaster said that you can not enter this page...' return "The webmaster said that you can not enter this page...";
} },
} },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wscn-http404-container{ .wscn-http404-container {
transform: translate(-50%,-50%); transform: translate(-50%, -50%);
position: absolute; position: absolute;
top: 40%; top: 40%;
left: 50%; left: 50%;

87
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankList/index.vue

@ -14,7 +14,7 @@
clearable /> clearable />
</el-form-item> </el-form-item>
<el-form-item label="日期"> <el-form-item label="日期">
<el-date-picker v-model="jmdListQuery.date" type="date" clearable value-format="yyyy-MM-dd" <el-date-picker v-model="jmdListQuery.date" :picker-options="pickerOptions" type="date" clearable value-format="yyyy-MM-dd"
placeholder="选择日期" /> placeholder="选择日期" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -28,8 +28,19 @@
<el-table v-loading="tableLoading1" :data="logList" border style="width: 100%"> <el-table v-loading="tableLoading1" :data="logList" border style="width: 100%">
<el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" /> <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod" align="center" />
<el-table-column prop="tankNumber" label="油罐编号" align="center" /> <el-table-column prop="tankNumber" label="油罐编号" align="center" />
<el-table-column prop="existingInventory" label="油罐登记库存"align="center" /> <el-table-column prop="existingInventory" label="油罐登记库存" align="center" />
<el-table-column prop="recordDate" label="登记日期" align="center" /> <el-table-column prop="recordDate" label="登记日期" align="center" />
<el-table-column label="操作" width='150px' align="center">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
查看详情
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -41,6 +52,29 @@
</div> </div>
</div> </div>
<el-dialog
:title="dialogTitle + '详细信息'"
:visible.sync="editDialog"
width="37%"
>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="油罐编号:">
<span>{{ form.number }}</span>
</el-form-item>
<el-form-item label="登记日期:">
<span>{{ form.recordDate }}</span>
</el-form-item>
<el-form-item label="库存高度:">
<span>{{ form.height }}</span>
</el-form-item>
<el-form-item label="描述:" prop="url">
<el-popover placement="left" trigger="hover">
<img :src="form.url" style="width: 500px;height: 400px">
<img slot="reference" :src="form.url" style="width: 200px;height: 150px">
</el-popover>
</el-form-item>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
@ -62,6 +96,8 @@
tabActiveName: 'uplog', tabActiveName: 'uplog',
index: "0", index: "0",
isSearchShow: false, isSearchShow: false,
dialogTitle:'',
editDialog:false,
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
btndisabled: false, btndisabled: false,
tableLoading1: false, tableLoading1: false,
@ -97,6 +133,7 @@
} }
], ],
logList: [], logList: [],
form:{},
logListQuery: { logListQuery: {
current: 1, current: 1,
size: 10 size: 10
@ -106,7 +143,12 @@
jmdListQuery: { jmdListQuery: {
number: "", number: "",
date: "" date: ""
} },
pickerOptions:{
disabledDate(time){
return time.getTime()> Date.now()- 8.64e7;// -8.64e7
}
}
} }
}, },
mounted() { mounted() {
@ -137,6 +179,7 @@
contractNumber: "", contractNumber: "",
date: "" date: ""
} }
this.loadLogList()
}, },
// //
btnHandle(btnKey) { btnHandle(btnKey) {
@ -189,37 +232,13 @@
doAdd2() { doAdd2() {
this.viewState = 3 this.viewState = 3
}, },
purchase(row){
this.dialogTitle = "数据";
// this.editDialog = true;
doBuild() { req.selectRecordBySid(row.sid).then((res)=>{
const loading = this.$loading({ this.form=res.data
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
}) })
exportExcel(this.jmdListQuery).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel;charset=UTF-8'
})
const fileName = '库存明细列表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
}, },
@ -236,7 +255,9 @@
font-weight: bold; font-weight: bold;
margin: 25px 0 10px 0; margin: 25px 0 10px 0;
} }
span{
margin-left: 20px;
}
.forminfo { .forminfo {
margin: 0; margin: 0;
padding: 0; padding: 0;

98
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue

@ -38,6 +38,17 @@
<el-table-column prop="weight" label="收料净重" width="150" align="center" /> <el-table-column prop="weight" label="收料净重" width="150" align="center" />
<el-table-column prop="value" label="收料价值" width="150" align="center" /> <el-table-column prop="value" label="收料价值" width="150" align="center" />
<el-table-column prop="inventory" label="收料后库存" width="150" align="center" /> <el-table-column prop="inventory" label="收料后库存" width="150" align="center" />
<el-table-column fixed="right" label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
查看详情
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -47,6 +58,83 @@
</div> </div>
</div> </div>
<el-dialog
:title="dialogTitle + '详细信息'"
:visible.sync="editDialog"
width="60%"
>
<el-form ref="dataForm" :model="form" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>原油信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">销售合同编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.contractNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">签订时间</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.contractSigningDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">净重</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.weight}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">价值</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.value}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">发货车牌号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.licensePlateNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">入库日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.warehousingDate}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</div> </div>
@ -74,6 +162,9 @@
btndisabled: false, btndisabled: false,
tableLoading1: false, tableLoading1: false,
tableLoading2: false, tableLoading2: false,
dialogTitle:'',
editDialog:false,
form:{},
btnList: [ // btnList: [ //
// { // {
// type: 'success', // type: 'success',
@ -179,6 +270,13 @@
this.loadLogList() this.loadLogList()
this.loadIn112List() this.loadIn112List()
}, },
purchase(row){
this.dialogTitle = "数据";
this.editDialog = true;
req.selectStorageBySid(row.sid).then((res)=>{
this.form=res.data
})
},
handleOrder(tab, event) { handleOrder(tab, event) {
console.log("tab", tab) console.log("tab", tab)
// this.listQuery.status = tab.name; // this.listQuery.status = tab.name;

88
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeOutBoundList/index.vue

@ -37,6 +37,17 @@
<el-table-column prop="weight" label="净重" width="150" align="center" /> <el-table-column prop="weight" label="净重" width="150" align="center" />
<el-table-column prop="value" label="原油价值" width="150" align="center" /> <el-table-column prop="value" label="原油价值" width="150" align="center" />
<el-table-column prop="inventory" label="库存剩余净重" width="150" align="center" /> <el-table-column prop="inventory" label="库存剩余净重" width="150" align="center" />
<el-table-column fixed="right" label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
@click="purchase(scope.row)"
>
查看详情
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -47,6 +58,73 @@
</div> </div>
</div> </div>
<el-dialog
:title="dialogTitle + '详细信息'"
:visible.sync="editDialog"
width="60%"
>
<el-form ref="dataForm" :model="form" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>原油信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">销售合同编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.salesContractNumber}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">签订时间</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.contractSigningDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">净重</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.weight}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">价值</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.value}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">出库日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{form.deliveryDate}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
@ -72,6 +150,9 @@
btndisabled: false, btndisabled: false,
tableLoading1: false, tableLoading1: false,
tableLoading2: false, tableLoading2: false,
dialogTitle:'',
editDialog:false,
form:{},
btnList: [ // btnList: [ //
// { // {
// type: 'success', // type: 'success',
@ -148,6 +229,13 @@
// } // }
}, },
purchase(row){
this.dialogTitle = "数据";
this.editDialog = true;
req.getCrudeBySid(row.sid).then((res)=>{
this.form=res.data
})
},
resetQuery() { resetQuery() {
this.jmdListQuery = { this.jmdListQuery = {
contractNumber: "", contractNumber: "",

Loading…
Cancel
Save