Skip to content

M
mes-ui
Commit a37bc868 authored by renjintao's avatar renjintao
Browse files
Options

setProcess... scroll

parent ca704af5
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 182 deletions
pages/processDesign/ProcessRecord/index.vue
View file @ a37bc868
......@@ -241,7 +241,7 @@ export default {
this.laodaction()
this.laodactiontype()
this.tbHeight = window.innerHeight - 220
this.treeHeight = window.innerHeight - 150
this.treeHeight = window.innerHeight - 140
},
methods: {
......
pages/processManage/Process/index.vue
View file @ a37bc868
......@@ -408,7 +408,7 @@ export default {
}
},
created() {
this.treeHeight = window.innerHeight - 150
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
this.loaddata()
this.getapprovalStatusdata()
......@@ -421,7 +421,7 @@ export default {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 150
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
})()
}
......
pages/processManage/setProcess/index.vue
View file @ a37bc868
......@@ -630,7 +630,7 @@ export default {
}
},
created() {
this.treeHeight = window.innerHeight - 150
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
this.newColumn = this.historycolumn
this.column = this.newColumn
......@@ -645,7 +645,7 @@ export default {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.treeHeight = window.screenHeight - 150
this.treeHeight = window.screenHeight - 140
this.tableHeight = window.screenHeight - 230
})()
}
......
pages/resource/resource/index.vue
View file @ a37bc868
<template>
<Layout class="full">
<Sider hide-trigger :style="{background: '#fff'}" class="menu" width="240" style=" flex:0;">
<StoreHouseLeft @storeIds="storeIds" :type='4'></StoreHouseLeft>
<StoreHouseLeft @storeIds="storeIds" :type="4"></StoreHouseLeft>
</Sider>
<Content class="content manyTabs">
<Tabs :animated="false" @on-click="tab">
......@@ -11,6 +11,7 @@
ref="grid"
:action="action"
style="margin-top: 45px;"
:height="tdHeight"
:conditions="easySearch"
>
<template slot="searchForm">
......@@ -56,23 +57,23 @@
</Layout>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import Cart from './cart'
import Return from './return'
import Log from './log'
import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
import Cart from "./cart";
import Return from "./return";
import Log from "./log";
import StoreHouseLeft from "@/components/modalTree/StoreHouseLeft.vue";
const root = {
id: 0,
typeId: -1,
title: '顶级节点',
code: ''
}
title: "顶级节点",
code: ""
};
export default {
name: 'list',
name: "list",
components: {
Add,
Edit,
......@@ -96,229 +97,230 @@ export default {
cartModel: false, //借出车
returnModel: false, //归还车
logModel: false, //查看日志
tdHeight: "",
curId: 0,
easySearch: {
keys: { op: 'nameOfResource,resourceId', value: '', default: true },
storeId: { op: 'In', value: '' }
keys: { op: "nameOfResource,resourceId", value: "", default: true },
storeId: { op: "In", value: "" }
},
columns: [
{
key: 'id',
title: this.l('id'),
key: "id",
title: this.l("id"),
hide: true,
align: 'left',
align: "left",
sortable: true
},
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
sortable: true,
hide: true,
align: 'left'
align: "left"
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: false,
type: 'user',
align: 'left',
width: 120,
type: "user",
align: "left",
width: 120
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'ico',
title: ' ',
align: 'center',
key: "ico",
title: " ",
align: "center",
easy: true,
high: true,
width: 60,
render: (h, params) => {
return h('div', { class: 'action' }, [
h('op', {
return h("div", { class: "action" }, [
h("op", {
attrs: {
icon: 'ios-cart-outline',
type: 'icon'
icon: "ios-cart-outline",
type: "icon"
},
on: { click: () => this.addCart(params.row) }
})
])
]);
}
},
{
key: 'resourceId',
title: this.l('resourceId'),
align: 'left',
key: "resourceId",
title: this.l("resourceId"),
align: "left",
easy: true,
high: true,
width: 180,
render: (h, params) => {
return h(
'a',
"a",
{
props: {},
style: {},
on: { click: () => this.detail(params.row.id) }
},
params.row.resourceId
)
);
}
},
{
key: 'nameOfResource',
title: this.l('nameOfResource'),
align: 'left',
key: "nameOfResource",
title: this.l("nameOfResource"),
align: "left",
easy: true,
high: true,
tooltip: true,
width: 150
},
{
key: 'specifications',
title: this.l('specifications'),
align: 'left',
key: "specifications",
title: this.l("specifications"),
align: "left",
easy: true,
high: true
},
{
key: 'totalNum',
title: this.l('totalNum'),
align: 'left',
key: "totalNum",
title: this.l("totalNum"),
align: "left",
easy: true,
high: true,
width: 100,
width: 100
},
{
key: 'numberAvailable',
title: this.l('numberAvailable'),
align: 'left',
key: "numberAvailable",
title: this.l("numberAvailable"),
align: "left",
easy: true,
high: true,
width: 100,
width: 100
},
{
key: 'measuringUnit',
title: this.l('measuringUnit'),
align: 'left',
key: "measuringUnit",
title: this.l("measuringUnit"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'qualityCharacteristics',
title: this.l('qualityCharacteristics'),
align: 'left',
key: "qualityCharacteristics",
title: this.l("qualityCharacteristics"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'batchNo',
title: this.l('batchNo'),
align: 'left',
key: "batchNo",
title: this.l("batchNo"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: 'storeId',
title: this.l('storeId'),
align: 'left',
key: "storeId",
title: this.l("storeId"),
align: "left",
high: true,
hide: true
},
{
key: 'storeTitle',
title: this.l('storeTitle'),
align: 'left',
key: "storeTitle",
title: this.l("storeTitle"),
align: "left",
high: true,
hide: true
},
{
key: 'state',
title: this.l('state'),
align: 'left',
key: "state",
title: this.l("state"),
align: "left",
high: true,
code: 'mes_xingchi_resource.resource.state',
code: "mes_xingchi_resource.resource.state",
hide: true
},
{
key: 'resourceType',
title: this.l('resourceType'),
align: 'left',
key: "resourceType",
title: this.l("resourceType"),
align: "left",
high: true,
code: 'mes_xingchi_resource.resource.resource_type'
code: "mes_xingchi_resource.resource.resource_type"
},
{
title: '操作',
title: "操作",
width: 190,
align: 'center',
align: "center",
hide: false,
render: (h, params) => {
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.edit(params.row.id) }
},
'修改'
"修改"
),
h(
'op',
"op",
{
attrs: {
oprate: 'delete'
oprate: "delete"
},
class:
params.row.totalNum === params.row.numberAvailable
? 'remove'
: 'disable',
? "remove"
: "disable",
on: { click: () => this.remove(params.row) }
},
'删除'
"删除"
),
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.logDetail(params.row.id) }
},
'查看日志'
"查看日志"
)
])
]);
}
}
],
......@@ -326,132 +328,142 @@ export default {
cartListCount: 0,
tabIndex: 1,
ids: []
}
};
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.tdHeight = window.screenHeight - 250;
})();
};
},
created() {
this.tdHeight = window.innerHeight - 250;
},
mounted() {},
created() {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
//选项卡切换
tab(data) {
this.tabIndex = data + 1
this.tabIndex = data + 1;
// this.search(this.searchForm)
},
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.cartModel = false
this.returnModel = false
this.logModel = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.cartModel = false;
this.returnModel = false;
this.logModel = false;
this.curId = 0;
},
cartOk() {
this.$refs.grid.load()
this.cartList = []
this.cartModel = false
this.curId = 0
this.$refs.grid.load();
this.cartList = [];
this.cartModel = false;
this.curId = 0;
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
edit(id) {
this.editModal = true
this.curId = id
this.editModal = true;
this.curId = id;
},
logDetail(id) {
this.logModel = true
this.curId = id
this.logModel = true;
this.curId = id;
},
remove(row) {
if (row.totalNum != row.numberAvailable) {
this.$Message.error('资源有接触不能删除')
this.$Message.error("资源有接触不能删除");
} else {
this.deletelModal = true
this.curId = row.id
this.deletelModal = true;
this.curId = row.id;
}
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.cartModel = false
this.returnModel = false
this.logModel = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.cartModel = false;
this.returnModel = false;
this.logModel = false;
},
l(key) {
let vkey = 'resource' + '.' + key
return this.$t(vkey) || key
let vkey = "resource" + "." + key;
return this.$t(vkey) || key;
},
storeIds(val) {
this.easySearch.storeId.value = val
this.$refs.grid.easySearch()
this.easySearch.storeId.value = val;
this.$refs.grid.easySearch();
},
showCart() {
if (this.$store.state.count > 0) {
this.cartModel = true
this.cartModel = true;
} else {
this.$Message.error('请将资源加入借出车')
this.$Message.error("请将资源加入借出车");
}
},
//加入借出车
addCart(arr) {
let id = arr.id
this.cartListCount = this.$store.state.count
this.cartList = this.$store.state.cart
let id = arr.id;
this.cartListCount = this.$store.state.count;
this.cartList = this.$store.state.cart;
if (arr.numberAvailable > 0) {
const index = this.$store.state.cart.findIndex(function(item) {
return item.id === id
})
return item.id === id;
});
if (index == -1) {
arr.numberAvailable1 = arr.numberAvailable //用于最大借出数量
this.cartList.push(arr)
this.cartListCount += 1
this.$store.commit('setCart', this.cartList)
this.$store.commit('setCartCount', this.cartListCount)
this.$Message.success('加入借出车成功')
arr.numberAvailable1 = arr.numberAvailable; //用于最大借出数量
this.cartList.push(arr);
this.cartListCount += 1;
this.$store.commit("setCart", this.cartList);
this.$store.commit("setCartCount", this.cartListCount);
this.$Message.success("加入借出车成功");
} else {
this.$Message.error('已加入借出车')
this.$Message.error("已加入借出车");
}
} else {
this.$Message.error('资源无库存')
this.$Message.error("资源无库存");
}
},
//移除借出车
substr(value, index) {
if (index > -1) {
this.cartListCount -= value
this.cartList.splice(index, 1)
this.$store.commit('setCart', this.cartList)
this.$store.commit('setCartCount', this.cartListCount)
this.cartListCount -= value;
this.cartList.splice(index, 1);
this.$store.commit("setCart", this.cartList);
this.$store.commit("setCartCount", this.cartListCount);
} else {
this.cartListCount = 0
this.cartList = []
this.$store.commit('setCart', this.cartList)
this.$store.commit('setCartCount', this.cartListCount)
this.cartListCount = 0;
this.cartList = [];
this.$store.commit("setCart", this.cartList);
this.$store.commit("setCartCount", this.cartListCount);
}
}
},
computed: {}
}
};
</script>
<style lang="less" scoped>
.full {
......
pages/resourceManagement/deviceManagement/index.vue
View file @ a37bc868
......@@ -696,8 +696,8 @@ export default {
},
created() {
this.laodaction()
this.treeHeight = window.innerHeight
this.tbHeight = window.innerHeight - 175
this.treeHeight = window.innerHeight-140
this.tbHeight = window.innerHeight - 230
},
mounted() {
this.initTree()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment